From patchwork Mon Nov 20 15:54:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1866120 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=r4r2/kJK; 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+bncbaabbwec52vamgqec43cghy@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 4SYsXY4zSHz1ySV for ; Tue, 21 Nov 2023 02:55:08 +1100 (AEDT) Received: by mail-lj1-x237.google.com with SMTP id 38308e7fff4ca-2c50255b905sf43648801fa.0 for ; Mon, 20 Nov 2023 07:55:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1700495705; cv=pass; d=google.com; s=arc-20160816; b=Hb0COUy+cyzFch15Crggt4uuZ+KzmMevBSXd4rGNyd97bTI0StXlnSGHbPpdAPIFyz s2PrY1dKY+WSNrFWiLDUl1xd5N9r9QY4HJXjbrl20GAW2QAC7fNPn2trm2Xxu6B+E8Fg vojZtGkpJ9TJxUc66bh+9KldryREB2h3UhFXI1BdKlAEocnDeNPgFatxKFuJghvpZ4mR IPtb/EP+iJ4sfI9E//+SNyVZJNcQ1uei7HAlvwGThLCPwsKMSnW/y+gM60RkBZ8N1nVQ 3Cvx7X7mRmESR++Eh80yx6s9uXctr6ju64uU8JcOwHgGqzUPSGGhOOhlC2rsGJ04s+cs ivyw== 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:ui-outboundreport:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=r5ClAwEkv8YMP58HvrUo9X3vaETe790crrofIkSoO74=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=AazS57H+BuuzstYYm+ed0hgVNusIl+0rJTY5w81XXyIdRafPc3F7/xNQ6UGn5F8YyV qXTtLWAD0yeQMNYmgApxZ6fp9RMazqNsRXju/TwgSB3FJCcYAJz9n9EWN9GigU2Uh5Xc 56oUhCX7hipfEvY5lGYEiMprPqQXJIQjm+snwPgouea/CcIDnDrvMiI6cjXk84JfiKE4 c3KyFG24tGjFS9WyoqHLCab5WGYC6Cc5yg9k3KYnuQIdZ+5GmChLlisueNDWNZ3fIcV7 WRbNhm7MR6hGJcECA9RxKoq7aDvdf39jBUAXPiZdnwrR/H4zTviL33TcpuukU4jbjmhf Qcdw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.74 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1700495705; x=1701100505; 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:ui-outboundreport:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=r5ClAwEkv8YMP58HvrUo9X3vaETe790crrofIkSoO74=; b=r4r2/kJKcRiLbcKfo0ordlGOWdeN1oMnPTZjeLgMmG/XQbBsWxiFbK/o5KtGGDOGOv W6xc3oZBEXU7qsr9pfi6O14rZoAVFnvqQalgsBj0Ki/EUl863ADYeW130iZPYorC6JBi ioko5VpLAPVeiRzcmpFSs5KE7MNCXbBatmoNmxmoWqhzHyFYcPoKPnrqG3wYvAvNXGoG izJaxNSVCOJqV0/nEqX//aqhjb1/5t/rYKcx5frITAcNx3OZgpcW2Gl7V99F0d+KgCii 42xNBCGiRwZlBzTEuhQkELlWI6lrvPlb8XTqTY5nDCGu32iOwTb2oF66VbqgEZVetGif yjbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700495705; x=1701100505; 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 :ui-outboundreport: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=r5ClAwEkv8YMP58HvrUo9X3vaETe790crrofIkSoO74=; b=Sj+KFrMIJQ94/V99HJxjaB2lx3bsvExiifpCxhQKyWU+qXp9RhDwiXj2//4YSsJZD/ NYvQLgaeatjjKmGzCw1HaxGQJtBasLqYcXfd0lsJtdBBw/QhR7p4/jlJR99OuSAWYgQ6 woSTLHN4NsNYS2lFaGHeiaZXTX9cCU3E3LdHgQHsn/iz2kfDsL6HOF5aZW5QgI7tfr4L ZoT+G57ImT30OYhRprUfnqVfzfTlc0uZ6quwo6KamzO0xRLOcPbG8IXB1KYiF2Iv/2Wu X6/PAvR095rJ3KTDfnU3KqnFQbP2brod3vUgHKOK6KulUKNjIvO8D36VhQhEIJBBZ+vt cLvw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YySxvx0m9EYJaYjLwLgHIbv9T6QOT0RDsfRPe/4qWxcCvBX8eVG RVkC6D9BriD0VEfl1EClBgs= X-Google-Smtp-Source: AGHT+IHX8V+HBkFCT6IiiC3gMiozI/fys1M6G2IctG5MAHj+RJ1avYBWQb3Q2dnyXEYic8LGBu1W/w== X-Received: by 2002:a19:7018:0:b0:507:bb8e:b644 with SMTP id h24-20020a197018000000b00507bb8eb644mr5349236lfc.12.1700495705322; Mon, 20 Nov 2023 07:55:05 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:aa7:c705:0:b0:543:7afc:7035 with SMTP id i5-20020aa7c705000000b005437afc7035ls87606edq.0.-pod-prod-07-eu; Mon, 20 Nov 2023 07:55:03 -0800 (PST) X-Received: by 2002:a05:6402:70e:b0:540:77f8:240 with SMTP id w14-20020a056402070e00b0054077f80240mr5086214edx.14.1700495702758; Mon, 20 Nov 2023 07:55:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700495702; cv=none; d=google.com; s=arc-20160816; b=EurNXfU82KZ70La30getwi2/ZjcMV0rIaRN4lQDkjaK08QejN0EX8YV9NYWA6jn8Dj d7dYy0VAfxRMPACGebBGRsFJwjTmNv8dvCNsSzyBfMEMq9GL7pbhV0AEuuUv1g/n9h1v Lus4BfAjVO0vQrJ4WSsaiZRu0QB4F+Wm9PF9qErjRo0m/v3yM9s2BA/byO5mDFOhKyj2 Iw+80qOmM9qFDz35XoSMLt6q5cORTluyhILdcBtpp2q9Mn1k9m9Q8sw5fUNq/lEmNYWy otVhDVKpQDQWckD8IdZjpt22NcudNplCMPeB5Vnr7HK7D1C9MEGMF1+6aIOhYE+zm8Ws mdDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=i0TZLEHPcCjlA/pG7s0HUWwLs1MYlqLHvXLC0Jky9mE=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=j2hbiJfZqLU6+kYhjXe8VsNZxSWp8wM5ziI9O4Yzh2UGFUBbogs15TK52HnWOmqdB+ ekoYA8kFKu8VFsnh2esMQz+o8pZmQCO994gMT2EYJc1jKXZY0YFniv7t+DcuKVLXu0US Mn1ofHKMM2CTGTRvZj6/m5x4B7DeF2GQCq7ZI6ufSeB2AxKM3WL/583GUguXWJ5BWPJg yMTC/ghSEQb1Lg+zin/dGqgaS79rKMIAOifbtc6rchEBLhgDAVAZqBR4nxGg94Aqv+Da a5hxIggIXXhB0SmgUzOTemVMGdtnel+vfj98MiPEVjaa3xAsCkn+me8G/NFi7Ptxj7Lw 7FMA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.74 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [217.72.192.74]) by gmr-mx.google.com with ESMTPS id f8-20020a056402194800b0054359279646si337736edz.3.2023.11.20.07.55.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:55:02 -0800 (PST) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.74 as permitted sender) client-ip=217.72.192.74; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue109 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MGi6m-1r90dA1HOc-00DmGo; Mon, 20 Nov 2023 16:55:02 +0100 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH 03/13] channel_curl: rename put_read_callback to read_callback Date: Mon, 20 Nov 2023 16:54:49 +0100 Message-Id: <20231120155459.45188-4-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231120155459.45188-1-stefano.babic@swupdate.org> References: <20231120155459.45188-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:QRGZFcDyFJpzePlyHK5YNhV5b6DX5XF42BrQidcFg1zE/decRgb 3siQa0efxMsSpIRFjHB/lGzavYnN9LHdrLzWroiN2zYJ2oMN7O0GtkWd8WUb2F9iWf5036X 52I9IRLz2KasF5MGGhOjs+CO9XoxghuUzmzDrfz/7irKYci+6cr7Tq7qpRU0w9JOjH789oE D640mNu6zDpRMJGug3GAw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:zb/oDlXj4hQ=;YDcWdHBFBKJmisLG4uoYi+XsozY GFtCunD8GFu5U/MiohaCrpyhRCcZaJGvQaI7W0wGTmId+3sUVDBYnFKjEejV2qJv81DvEd83u VKCHTWmW8L0XcdX4y9GsEGmlUzDlN4mWQ0q1uMf6FfRnRYEKAV21sJ8YXOuEqC57lf5VNS0SG bsZTiHAFQZXsvqcHUydEvIFk6ihtoZpWxqnd8EBwC36s9JVxbRHVt/fe7zH5Z1dG5OcidOBTh XA8IkEFehgaTvvZ7U4yPvCnz0mu6kThAV3VQkvKWaWWEjqbDlBdrr4HlM4q7nmZb7mtQ9a+ER mBTpsY4Fgfi8XC6r8WLvNcwlQqZkjmpnXi2wVe/bLo6yIHtFk3BSjLEKssq31Qu+M9MSkCYnO BPBbMd2aJ38N99hP4tMrlDE/YtBQ1EQpOyqZPGitzqurkpxSDKmdyih5hi2BOkKIH/HQXzZnN mlHQpZsj7ghtKokJtlD2mEhGz/7takO+h1Bp6AuOVpDpFYC7QLfoQUZZNv60YtNPyqJBJUOjb tirix0DHXY3Tgla5KfNeAVZVgODacWQyvnnEZElLFeaof9ex3DAEU3/oNGJ2ZHULq9Rxmt/eq Brcp59C2M45ytqS8PHZt8Y6rI+tW7pmK3+O9zHiLirYBteGx4IA6fwyMy7oBgxc9nxvPmvLX+ 4d7NdAAFauOUJn9Ab2O+VW5ZPWlt4jiz5DgI1DsCa4wT3VAiHQePpI9jioWhNLC+e2XZ/uDJ/ vGAabyX57oNyj6W642MDOH7PFaLEzjZCPBbWoF4DiIDvlMYvAnQyFzUpSNhqbLxAmsgIhFS9f whVGd/pQ6oh4ce7TAhEw8+uMBwgdFyxSdoBYGfFlorurOoWzWmWn+fPyLt5HrPNxTNKO42wfX +9YWGqOoQkhUcwLTzoJJu5nG8oWKVVeQtL9I= X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.74 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org 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: , The callback should be generic because it could be called even by other methods and not just in case of "PUT". Signed-off-by: Stefano Babic --- corelib/channel_curl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/corelib/channel_curl.c b/corelib/channel_curl.c index 9842d7a5..2da49ce3 100644 --- a/corelib/channel_curl.c +++ b/corelib/channel_curl.c @@ -888,7 +888,7 @@ cleanup: return result; } -static size_t put_read_callback(void *ptr, size_t size, size_t nmemb, void *data) +static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *data) { channel_data_t *channel_data = (channel_data_t *)data; unsigned int bytes; @@ -1041,7 +1041,7 @@ static channel_op_res_t channel_post_method(channel_t *this, void *data, int met CURLOPT_PUT, #endif 1L) || - curl_easy_setopt(channel_curl->handle, CURLOPT_READFUNCTION, put_read_callback) || + curl_easy_setopt(channel_curl->handle, CURLOPT_READFUNCTION, read_callback) || curl_easy_setopt(channel_curl->handle, CURLOPT_INFILESIZE_LARGE, (curl_off_t)strlen(channel_data->request_body)) || curl_easy_setopt(channel_curl->handle, CURLOPT_READDATA, channel_data);