From patchwork Sat Jun 15 19:11:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Glembotzki X-Patchwork-Id: 1948200 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=QgntzbUS; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=U5RsEPkU; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33d; helo=mail-wm1-x33d.google.com; envelope-from=swupdate+bncbdy5juxlviebb46sw6zqmgqeiwlq3ay@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-wm1-x33d.google.com (mail-wm1-x33d.google.com [IPv6:2a00:1450:4864:20::33d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W1mFS5dGtz20ZB for ; Sun, 16 Jun 2024 05:20:28 +1000 (AEST) Received: by mail-wm1-x33d.google.com with SMTP id 5b1f17b1804b1-421739476b3sf28139655e9.2 for ; Sat, 15 Jun 2024 12:20:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718479222; cv=pass; d=google.com; s=arc-20160816; b=gzEaLyOP+zqnPBRefLtMfkRMFpiEfBhqSFKFnlNR2p9IAur2xENnTNu4ziUy40KcqT nXlVjrDprfH0P0jYtKIeCPaWexxJ7NrUIGRZ/tK0cOCwWuP6/BKka5bQD8gskPu3IcRp 2H7/GKXBaCu7lKhKX4fiPN+xQ+c9qJzmFgDYZupKAZB28HCrha3INe/LFK14uLd1zDlS g+VHIeMioN4xFdaTfxdmLxOOVQ8ebgy81VFfcuLatHLKf//tOuA8FPM2JOIZBA5p3uNi TfID6G9UbX2xEkgcLb3o0qMexL/QXplKOej1AT/kyhcISJtuu2LcgfzS1VBFaxs4pII+ kiAg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=MErXvDEJzmNprYCnFW9eHtZK7l0nRteXVFp54GDYN70=; fh=S4YHzENMXufjjwR1fCiNMqRQOIw4+Eb7TJYtfdT6ZOQ=; b=CCIl3pQXwbHEciItTEipjGzM+rzt9Gf6QgBk/QEhkJ5asWqZQn8Tro93kHPp2IQX73 gBHQDhMplET92oCGaEDeoxi/F7sLwy6rMC0+tevKovVeYb7zhpK+xmGh/wtLohHXqqFd kyflijelZAwER6qqrBp583PbjBB5TmtiR/trvSCL7ecu84+DDLmmh+buNWtN15D1pfG3 igFvgJqduJ1XqwmJGWf8snL0fbJHSlAVNK/NuZdvgPOdCXBWMkD5xEhxJIh88pCQteZi UWPUVBJ2EaYD0/Nv3UbjYwx9nWB4VXeOEz7v7Gv32ffOkzokMKA82WpdE6NTo2UcyUtL aH0g==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="Wd4/0as8"; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::233 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1718479222; x=1719084022; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=MErXvDEJzmNprYCnFW9eHtZK7l0nRteXVFp54GDYN70=; b=QgntzbUSrG0nqOPpKi+4+K0oPLXm9ohzllb3mPn7fhl+VFKMscXZ6ghz5CxVS60X7Z dwXeKJzWoXWPdL8eEsY4ALCoEq2Xp0yJRp5klHsEDYs03YkclqnGMmXCjgxNGHOpjchb ymGV3inyJ4w/VxDeIIlPqoZGFphNJg8drjzVLcaH5Xb63aEBBH+nI9V/22PRjqvKtjew ijYFVHNWvfx1I+i1XbyvRcXby6LcVn8AD6DXQp4Zx0/oybxuWQt3/0CDWJaARcYElZNh Ze9g4iWPByAo7zT6GCBFEB1Cyi0k45NmhihyoJDXLH7EioEqIuCQ2izYBM0CaMPO/pEp y65A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718479222; x=1719084022; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=MErXvDEJzmNprYCnFW9eHtZK7l0nRteXVFp54GDYN70=; b=U5RsEPkU8mr8Sbnwt5hjUmKEkc851Iv5bYgqsZzgOHrOJB7/VPqnGUsRST4NPxanza rHGVd3XJ2dvZV19rwHa6sWi8EqKZOJAZEo8fq9RsI3ssmTQFo9gZ+uzswdJoKq7jZASP fAXnZ+NXiXJbLxe5aSTEFbKaaLVj3O/6ZUJBJtxmA4gZ4DE+5f1ijORDHreH7jxv/pRu BPaMNdsq3NdORDM8gR+wMbXyMp45zRySrSMod5zXIXIUgfqHOW3GisGT2VAHNQua+2nh DS2C3UlF0jutZlPe/1kRJc/yUDVTDh5UCSfpiVWEJ6XNR37VvaomZNz9DzAR+SMgx9un AFow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718479222; x=1719084022; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=MErXvDEJzmNprYCnFW9eHtZK7l0nRteXVFp54GDYN70=; b=f6pV5DRWF0bxDsnEYG4YQ7oIeY7TGH2FXYM755bud+fEmlurJGnoOl5lxWT/Hh1KzK iY77gdelPlkbj2g+ylQpEmXJsf6ntYhcS8dsja0hphU8hQ/b33jf6IiDw8Y0XwYIGlJ+ F8vp6/Wfuq8xipHZUp4NL6ryvqN8TA4JjFiesBMmaQH4uO4z0lCS3RKsDx/6e4Ciaxw8 YUshaQdjZ2HesTBurWd2Cmx9eGdqANHFPU+WNYut2GIF88bKQ6z8SAkkRkFtUuAIWbUT 82n+EJU17bE6DFEMTquMJJ1EwTD1vqt2ZUQCUvUVn0Vedx8CMGIa9lQDHsI/YA/7f6s/ Fizw== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWJQ6Lr+RA8n+8ygxKmBV9fkNzZI/+dkYY3+1ROQqBN5V8egs1pN8AjLPW8cPyQbAvSgXfkDIO+dOe9UnihQqr0wTJfgsvN3PvMMvlb9g== X-Gm-Message-State: AOJu0YxkmU8/xdSbwrF/EDEYGhON2Dl0/WVs4/LrUE6ckDPtgZVEweP1 n59Pm0dmp8OCGZ4VgyAomRZrk6jTbbBbj6ZLhBaJSyEHzML6HPpP X-Google-Smtp-Source: AGHT+IEwmBBdfIEMxmzCv6qJQesQ+UFpHzsW3US2wXWfyq6ndGmCCwSgUq2aKWbSqgqOwU5gHlQwcw== X-Received: by 2002:a05:600c:4509:b0:421:f04d:ebcc with SMTP id 5b1f17b1804b1-42304826620mr51756615e9.24.1718479220757; Sat, 15 Jun 2024 12:20:20 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a1c:4b12:0:b0:422:cb6c:76e0 with SMTP id 5b1f17b1804b1-422cb6c799dls15262995e9.2.-pod-prod-05-eu; Sat, 15 Jun 2024 12:20:18 -0700 (PDT) X-Received: by 2002:adf:e2d1:0:b0:360:7c17:5936 with SMTP id ffacd0b85a97d-3607c175a00mr4279187f8f.58.1718479218032; Sat, 15 Jun 2024 12:20:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718479218; cv=none; d=google.com; s=arc-20160816; b=NrCwHz/mfr1aYLapytMXYJY9pAFP5t4tehqXHE6EvarfiNX7RGPYI5oheebTFopGCk jsxlR4j7bIc3F48C55SkGDC+6/szOqm3hROqNPVBX3dDrTYfTwe+fUBaMDuRMlsqV41H gJpjoDaPgT6QUALD8YK6RuTFyONH7XKlewu2w4OyFPRQHtP2TK3X18bbaZs+oh6zkd2u 2JkZB/Qul3pGlkaiB/fYv2eKmM4HW4i/Y/fxizo3YWTXSEyo1jlMIlJ1XtThvRHQ3pKM GiT8WTTQOo0VJav4UMaQJ5NmwPNPc4JXTEW9nGIGu/VmWSWQ1actZFOIgy90JHLm4PmN M5/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NfyJhg8lq4sXonCV32RiyirEvsl0Wcw0IAFumk7cFtw=; fh=zydHuzCQWrku2OPQyZfraJZFcOpEXLQ/YBcu3QNiBd0=; b=qcZfRcgC385H6vs3YpErWfpjlcaQlEGbBHku0AyznxsRfu257R3CrQd35HwNUkK9Sy yD0iZboxpaiDd2/uCi/erDEHMF5vU/QTX1MmBAWHApguRNIVrtk4QHU79OTSWD9FEd+X /qfpb+Y9arJNPqS4V8qF6LVhjhUzydE8wjqdJ8tR87TdbHdXexL1tYra3i0uB2g2Br4v k24H9JHNzMQ3yiZOYBzOb2Gc4pYxtjPQ1EnbProVAZmehLBo9kdXM0oFPpHBfjw0/gdM UMwAwB03w/PGW5B5/KFobYCow/fBqE4iwdpbXSZNzEjST44C2MvsJoN9fPJuljmFBszo I6Yw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="Wd4/0as8"; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::233 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com. [2a00:1450:4864:20::233]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-360867eb198si62018f8f.8.2024.06.15.12.20.18 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Jun 2024 12:20:18 -0700 (PDT) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::233 as permitted sender) client-ip=2a00:1450:4864:20::233; Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2ec17eb4493so22341181fa.2 for ; Sat, 15 Jun 2024 12:20:17 -0700 (PDT) X-Received: by 2002:ac2:4989:0:b0:52b:c2b9:d988 with SMTP id 2adb3069b0e04-52ca6e6e859mr4344008e87.40.1718479216676; Sat, 15 Jun 2024 12:20:16 -0700 (PDT) Received: from PC-2635.irisgmbh.local ([2a02:8108:96c0:76fc::80bb]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6f56db61e0sm327283766b.49.2024.06.15.12.20.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jun 2024 12:20:15 -0700 (PDT) From: Michael Glembotzki To: swupdate@googlegroups.com Cc: Michael Glembotzki Subject: [swupdate] [PATCH 05/21] mongoose: Remove deprecated events MG_EV_HTTP_MULTIPART_REQUEST Date: Sat, 15 Jun 2024 21:11:18 +0200 Message-ID: <20240615191941.40301-6-Michael.Glembotzki@iris-sensing.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240615191941.40301-1-Michael.Glembotzki@iris-sensing.com> References: <20240615191941.40301-1-Michael.Glembotzki@iris-sensing.com> MIME-Version: 1.0 X-Original-Sender: m.glembo@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="Wd4/0as8"; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::233 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Events MG_EV_HTTP_MULTIPART_REQUEST and MG_EV_HTTP_MULTIPART_REQUEST_END have been removed in 7.0. The mg_call()'s have no effect. Signed-off-by: Michael Glembotzki --- mongoose/mongoose_multipart.c | 4 ---- mongoose/mongoose_multipart.h | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/mongoose/mongoose_multipart.c b/mongoose/mongoose_multipart.c index 5e57d326..fb62c1e4 100644 --- a/mongoose/mongoose_multipart.c +++ b/mongoose/mongoose_multipart.c @@ -112,9 +112,6 @@ static void mg_http_multipart_begin(struct mg_connection *c, mp_stream->part.name.len = mp_stream->part.filename.len = 0; mp_stream->len = hm->body.len; c->pfn_data = mp_stream; - - mg_call(c, MG_EV_HTTP_MULTIPART_REQUEST, hm); - mg_iobuf_del(io, 0, hm->head.len + 2); } } @@ -149,7 +146,6 @@ static void mg_http_multipart_finalize(struct mg_connection *c) { mp_stream->part.filename.ptr = NULL; free((void *) mp_stream->part.name.ptr); mp_stream->part.name.ptr = NULL; - mg_http_multipart_call_handler(c, MG_EV_HTTP_MULTIPART_REQUEST_END, NULL, 0); mg_http_free_proto_data_mp_stream(mp_stream); mp_stream->state = MPS_FINISHED; free(mp_stream); diff --git a/mongoose/mongoose_multipart.h b/mongoose/mongoose_multipart.h index 552ede2d..1d2b7dcf 100644 --- a/mongoose/mongoose_multipart.h +++ b/mongoose/mongoose_multipart.h @@ -22,11 +22,9 @@ #include "mongoose.h" enum { - MG_EV_HTTP_MULTIPART_REQUEST=MG_EV_USER + 1, // struct mg_http_message * - MG_EV_HTTP_PART_BEGIN, // struct mg_http_multipart_part * + MG_EV_HTTP_PART_BEGIN=MG_EV_USER + 1, // struct mg_http_multipart_part * MG_EV_HTTP_PART_DATA, // struct mg_http_multipart_part * - MG_EV_HTTP_PART_END, // struct mg_http_multipart_part * - MG_EV_HTTP_MULTIPART_REQUEST_END // struct mg_http_multipart_part * + MG_EV_HTTP_PART_END // struct mg_http_multipart_part * }; /* HTTP multipart part */