From patchwork Tue Jul 9 11:08:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Glembotzki X-Patchwork-Id: 1958323 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=V4cLLuvq; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=QtmidZam; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::237; helo=mail-lj1-x237.google.com; envelope-from=swupdate+bncbdy5juxlviebbrvxws2amgqemz37mgi@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x237.google.com (mail-lj1-x237.google.com [IPv6:2a00:1450:4864:20::237]) (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 4WJJLg3SWrz1ySg for ; Tue, 9 Jul 2024 21:15:23 +1000 (AEST) Received: by mail-lj1-x237.google.com with SMTP id 38308e7fff4ca-2ee8b7eafffsf52061131fa.1 for ; Tue, 09 Jul 2024 04:15:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720523720; cv=pass; d=google.com; s=arc-20160816; b=1KYFn029KpzCnuO6fOWJvAdJDkjmBcojKOS3QQ8l0faxeSud/5VgmSr2apd/n3twad mJPe9ghjuy0sbkS/480bLsxvIRrKSJRa5YUbhWZmldTpSorP620GaIwEa8g66XZ0ybPP prjJiblpRUq8D9ngKTmyJtMu74U1b70KB2Sw2sH0A3gLHO0srhZS/zuHPtaruo5RYc0+ 6+eFLKZgGrtkl31pSISASFaWZZFzQckz47ZrQZjkkVniY0QCHf6Q4X7G6wcz+6UtqwSp EdWrD5OOeg7r8gJTvtkYZmlRLu2SA7/cV/zLztTvTLR3ujWu62eldDYBKecas8KDTug6 njSw== 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=WOtZDxkMlupjJO56My1ImOsbonwEOra/n4OqtTwL7ag=; fh=+MdtpIZ1mJCHbStIMeGWNfZm4+c8K+XD0IujqV8PTA8=; b=TzPApq0WzIF2zew8oLJTb0tjKZLad4VzINqphgCoZu1iVlFEq7GdlIrwnZUe9wLrs7 j+TOcDf1EbkdUp0CbZJgi0cvD6dfL7imkEBKKj/hdYH/fucmnel27sKxfWPzyExwIenZ trU6wEpZmHJg90WW1UcSkWpT3mprkSuOf34odrQY2IoXxQlk+RYCpfO5yG/42TKTORf7 5j8LNpdhQI4xPogL2R2W6yu2WyWZyEKIRtfyIWkUVSPKG4dX6If6rLvT+OSJEltvaPNf GLOEDMechmbVF3VNHn/4+f9yPGEuVlMLDCv9w9JOIAzmUCw202/4JL7ktOHHZj41Ssdv HaZw==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ITjmbb+c; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::12a 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=1720523720; x=1721128520; 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=WOtZDxkMlupjJO56My1ImOsbonwEOra/n4OqtTwL7ag=; b=V4cLLuvq+PtiqGgEdzdTzO3YFp+GZmNr3zE5+sWog7BDS2cfXfVW5S9ZKN807nxr8T pYthAXSUbQest+3x4SroywUyXKcEVnzkmtgapUL9S5yzKJ5jSRqKVuZUs7B17Xxs01s9 c92Npg/VsCh1jXVUcXT911pZfCLaXpbbuPeeWbDq99YDilznHtcGsSXon6C27KIAhCoL xe/6ABtN4z7ko6W/fCGaTl4xwpNc+HrT/FBiLZupeXv/8Py6nBibPwrBuGgLOyS90kiV fNcfkoalKfa8BYBwXxPAjYkEZO5Fuos+Q23cKZCI9jhYZ57mdVqcMvUmhusKRAt3Qbgn 2EUw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720523720; x=1721128520; 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=WOtZDxkMlupjJO56My1ImOsbonwEOra/n4OqtTwL7ag=; b=QtmidZamwrcjj5RS4//iSR0iy39kAeaTUV124jKkZigMWS6S0J2Ul0T/4RnpmCKnEj FgukpeGFxlbL4UNIBNq+/Qu1P4OXqyWs51qjoSb7B+M8MJOSMlbifWC544fbqj8zAWFy x3HLZOMBclywHs965cqhLRgBg1m4GWUjziFxx7EnhRMP2V/Vt+fDRhTIecz+aUXLkiMD +Pur+URhEnIEy2DtaDVxeon3sYkoOKkX50rLXY2swBuABBj6yMvb7wGw8Oc7+nnouZvF Atf7J1/cwCnL4J3Q7tHtkYllNGoGy3d2kF8D2th64PmU2rWwrCwAmZM915n8RQGmgLgm P1Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720523720; x=1721128520; 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=WOtZDxkMlupjJO56My1ImOsbonwEOra/n4OqtTwL7ag=; b=dBjGKKGs50rSbA+pBa4lj3KTxKKxurAGzuqp6fdZXqs11cR4od1cGWYeTVABmisiUX aPQL6i0omQFMnO8B3fNMyINj/BiBRKHeBq7ILvqXYGTAx3P45Mq7Y4wN8RWiCRV95IPk Jz6OBT6I2p2S1IbwJAaWjLkZNLWwB0/CZyH6ULSEftmU8nawDWtM4geInvZkDyDdGqF5 JmioVD28yjwpRVbGCG8GpDD/1MvLicTYsiGXh6Y7Lu3KIxKbpNV4KDNtzaBwkrnARVQ9 S2Ym0mbfBy8+Zoi0jjAUmUfr3JfIqM6shiQrksUoXKcPxks1DBeVjz2rEypVphwTcvQz V1kw== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXKUzPTDBmmpQKKuHSEHWirY/WzEm0T56chis2ujmtfgf/XyHoMO2ljcREXYUZb/aoXdRPiqY6rahg6kEN/ObQfQ8D1Uq+H3tHfwbbXyQ== X-Gm-Message-State: AOJu0YztIB3Q6YMR8uiCXpKu0aQwgvEDKCWD51g7/UxajQ64qdHHjEH1 pMVNSFMY0F1VFnMVPar6PKDa4ceploLTvKDi23taZ29/DE3C+Cd9 X-Google-Smtp-Source: AGHT+IECWgQoghKeTlAPmPn3iseue03Wvmr+BjN9AzJRLGzkkiWM0eMZGK0Lrpvj+uwSDz5rHNtXqg== X-Received: by 2002:a2e:8691:0:b0:2ee:6a72:f006 with SMTP id 38308e7fff4ca-2eeb30e3ademr15712551fa.21.1720523719225; Tue, 09 Jul 2024 04:15:19 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:5355:b0:426:64c1:8974 with SMTP id 5b1f17b1804b1-42664c19475ls9543965e9.0.-pod-prod-01-eu; Tue, 09 Jul 2024 04:15:16 -0700 (PDT) X-Received: by 2002:a05:600c:4a24:b0:426:629f:154e with SMTP id 5b1f17b1804b1-426708f2111mr13307135e9.30.1720523716622; Tue, 09 Jul 2024 04:15:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720523716; cv=none; d=google.com; s=arc-20160816; b=mCj2ozQ6Uo1T56AHUvhdD63Iq0ynAJcpOMH0mUVBzxN+cIL1m+RIByqq3zyGurB5Wz R8OGw7Ixrh7Ks/1ss9cbn0KEEFxY+/zv9wB7O+HfPnaiSL6OzR6lkkJcUULwLZ9i2oR7 mkJ16aMgMaOc7M1fbXyCS+Dylq/WrgBAJpFX7R5Q88dHcg/ULBrj//wznGvx86HNsWKP x4tKXU8X/EWmymDAP0YsWrkeR2STtR4bN6CT63sFx7ea82luSW3vFbveGvY5ldCKN8an cu9EQKMp9KePJsLPaYmaLYZnSatFg9uyccU0QYES0RdD5+WvF8ZWP5tL7fAi4wv/YSzW /V5w== 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=fcfO0Keh1wjQwPAi2NxssX+m8Z3Ojk/qiwRdt1mpXZzEptH6dU9nl9ScGQQwJv7dM/ rhawZuQzExjjDrqekUM79ru6lq3euAFD3QV6IwuG4MDR3rFjBXcp5FFuNFbgZ3epgtVb 3qvt6796L7mEoJAVe8UnzQ6L3Zp+V51Z/uGxFyNdoCX8fAYbEQqMj8ckhzPI6S2Va9Dj WsMjJ3DlQQAW9K0sNvUyfDbcmhviaJJ2t+5vbDzCQCFyhd50miSkXTLwN4QsKmxY0r/n HMRLLy52W8XVKFwJ5vid8MbTRyDBwD8OwJrhom1QnstTAYk2PZNgnN84THE4nJRnZ9C9 I/eg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ITjmbb+c; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::12a as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com. [2a00:1450:4864:20::12a]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-426740d9981si504295e9.1.2024.07.09.04.15.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Jul 2024 04:15:16 -0700 (PDT) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::12a as permitted sender) client-ip=2a00:1450:4864:20::12a; Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-52ea952ce70so3177054e87.3 for ; Tue, 09 Jul 2024 04:15:16 -0700 (PDT) X-Received: by 2002:ac2:4829:0:b0:52e:9df2:7ddd with SMTP id 2adb3069b0e04-52eb9994cd1mr1134313e87.22.1720523715247; Tue, 09 Jul 2024 04:15:15 -0700 (PDT) Received: from PC-2635.irisgmbh.local (dslb-002-203-138-100.002.203.pools.vodafone-ip.de. [2.203.138.100]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6bc8adsm70739166b.14.2024.07.09.04.15.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 04:15:14 -0700 (PDT) From: Michael Glembotzki To: swupdate@googlegroups.com Cc: Michael Glembotzki Subject: [swupdate] [V3][PATCH 05/21] mongoose: Remove deprecated events MG_EV_HTTP_MULTIPART_REQUEST Date: Tue, 9 Jul 2024 13:08:41 +0200 Message-ID: <20240709111440.8215-6-Michael.Glembotzki@iris-sensing.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240709111440.8215-1-Michael.Glembotzki@iris-sensing.com> References: <20240709111440.8215-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=ITjmbb+c; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::12a 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 */