From patchwork Mon Nov 20 15:47:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1866105 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=D1U+WYCg; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::43e; helo=mail-wr1-x43e.google.com; envelope-from=swupdate+bncbaabbf775wvamgqeaz6egba@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-wr1-x43e.google.com (mail-wr1-x43e.google.com [IPv6:2a00:1450:4864:20::43e]) (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 4SYsMw6P9lz1ySQ for ; Tue, 21 Nov 2023 02:47:39 +1100 (AEDT) Received: by mail-wr1-x43e.google.com with SMTP id ffacd0b85a97d-332cb6be78fsf241695f8f.0 for ; Mon, 20 Nov 2023 07:47:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1700495256; cv=pass; d=google.com; s=arc-20160816; b=exbEoq2+pK/V0sZ2xK3SaDmIjBo6p7XF1bPDnFtmqd6idCQZEexbrjT8BNgXCOwNS/ UrlJ3OZR+PyTzIvob6AtXmbve4ZD35ypo9DyQ2Klna4tpScqifzgwaF9opM2dcOvnO0z Qv7SBnw7WWX2Pzvd4pbK1Eln6k3kxJbj2i7bnhkDg96bsYg8aqKz9PxltbF/KXGLewJR I7rGpp5WszPqPdppMFZOc9MKaet5VMJlEj4NWqkD2b2Aqa57gatc55jQCSUBTUzPWYht nB/UPRJQfrrLI7lDI6YEp0/BvXtCvJ171W5zRXX2ZEzOEEwxAuE4UO7MyB1op6i/d1lc A6zw== 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=UKDtpglMnD6br0mxmZsZYWWCPfQvasWcIEDtmKE/jt4=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=FEp70GagzqPT174LMtafJfOE/ux3jbvzd6VYDm49Z2X1E1PUlFEGaxQ4xKAStIUkfR h+02lLnS5coKRaFhqIbUoWdclTgo/GjT7XfccrU8FIgT/wGyzderZhSSh0iazWdgH6il YW1DDl6L2VlF+0XarwXG9Jsl6LEfY5TUddqweL/y0RpnYCcWykIOhgfzvXNBh1NPFS7w aOVv51VVrA+JrpZvm8aTCG+RId/cEyU43EoV5OgKqM8xMbUGgAxuskFd8aPjxQkfVIv+ a5xZ7Yv2m9YBEe83YlCYsueoozJyRpeJQIk1Td26BZBVVKCtydyC9HiFjW9vj9S2Ksp8 Bmng== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.13 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=1700495256; x=1701100056; 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=UKDtpglMnD6br0mxmZsZYWWCPfQvasWcIEDtmKE/jt4=; b=D1U+WYCgrlPC1QlvnPH5bkmifcEFVnk6AtjdsGTRkvMGieIffLnXzfTE9cLEbBup9C Wj78WLpjISmgnMWvP7mxjUvqiG8r9EF3+Rtz5fnoyb7jruQn5x2vM34Z2607OYtpSj+R q+qSaX1MxbutNrxIbUnyszCTtBrqY75cppNCYNPnOrXfdTybNBKHswN44eUuYZhB2M5N TVPc6Mg68XDYIGZW8H8izuYgrtJQk9Q6YyBVrLoaNaiV02oaj0vQC8r+tG6BjdiDWhc1 P0N3VUbPpFdqFDbV2X8DaQpZBlOLy0GCS5j66jl76WQLAHpRIkk0k8/iCxJ+O602vzf+ HMJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700495256; x=1701100056; 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=UKDtpglMnD6br0mxmZsZYWWCPfQvasWcIEDtmKE/jt4=; b=M9g1KHGWb1E/Plm1tsnHO+gF1tbHyfvc8XRncXK+TS8/cGHzvCdSuXWijUnWArC4ca lftvYgv5IBH4KOOYw0RqqTIVuYGMb+N3imCt8KUlw5j/1K5vSCmHK34W6pNw6sTQrOLH kINZDrSdFskZZGKtQ1urjhP1Nu5HgKUBC1NRgAui8H6/ZB9VTc8bms7OCbJ/yMDMmWkJ 5Ype59MGkfZcUmnZ+5ubDqM00+7qX3rI72dthHKWnvTtJqwOymwAHJ5FRO+3Egkm/5zn aBnXQ8qI0XbIaV1UOwEJZVs5C3pTv9/Fua+jRYHObsr7npHSFOmUrTFrzshFxcCTkvCY ehqw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YwsutfDjY6LF5wD6Pj04Esf4to6/8+3iqmvTA5F7p23N0oD4Jn/ vsvgXc2wRE9B/bLDfWohokc= X-Google-Smtp-Source: AGHT+IGVwCUF6CU5Jm6nLjTmRE3C6BVM1X3MZbi2g1arPcnCvcmztbccJYtNvB8DRBRJJLOfd7Qifg== X-Received: by 2002:a5d:584f:0:b0:332:cae7:2ec7 with SMTP id i15-20020a5d584f000000b00332cae72ec7mr1615671wrf.22.1700495256243; Mon, 20 Nov 2023 07:47:36 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:f685:0:b0:323:3654:7d7d with SMTP id v5-20020adff685000000b0032336547d7dls1763338wrp.2.-pod-prod-03-eu; Mon, 20 Nov 2023 07:47:34 -0800 (PST) X-Received: by 2002:a5d:4389:0:b0:32f:b1ea:db78 with SMTP id i9-20020a5d4389000000b0032fb1eadb78mr5914769wrq.59.1700495254355; Mon, 20 Nov 2023 07:47:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700495254; cv=none; d=google.com; s=arc-20160816; b=PpAfVBLYI3FjoT7sahgMfLzdGboZWyIgCFEdClP1ky3CTtK5ag1KqRkK8Et48VKhVN 7q7slzRgPGNIRkNaRT0qm2X74lpMY1cAbEm8szJ/RbvL6WH+OlfP/tEGCjA2MvMxBq9N wPAY174kGzykGtGtD+dvBFRoE+v8Bx2K1jgIyhq1bJKYu09RQi1EQTpQrNyei1KsHeeK E2+1o6C1f86JBejWDCL7JeLILz40ne7x+C9nzEXLEkWq3aceVgzrxVjVjBZCyirpEjuP couXPdEWm9mu4eTqJS+9SPLcedfUVoYa7ogKQNcIhMj3zbHB5c30CfzPwGUErwz3t39o +DhQ== 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=c1wsEyC1KOxonjd/8Clejdh7CLAo0AeHv/d3IkuZ8AfItXVnHex1rwwoiqO4fuZFzC aBQF46bDwPJYvnMwRH1OPAjhPFtd8WN8PuS+kjA0wC5Si8wFMRQFp0k+AjaMo/dTgBtZ +J1/h0Of2d/70zvVL4ofvZMwf53jRydzDCgq/XNjLcjgkXSvcM1mAoW+U7aexi4pxovW hluaysAXBSXdSNhcqUmH5jCwWaq3Fbxj3GbIpZ25qDWZNmJ2HoNHypX9xAkGcwJHdlK2 8vvTN0U76bgNvDgSvSmN3eZ1vxJnuhKp89z8Z9BHxkz59u1gcmIZdGaNrcMS1aEik8cv HGfg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.13 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [212.227.17.13]) by gmr-mx.google.com with ESMTPS id f4-20020adfc984000000b0031fe51902bdsi288667wrh.0.2023.11.20.07.47.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:47:34 -0800 (PST) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.13 as permitted sender) client-ip=212.227.17.13; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue109 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MCKO4-1rDJhv3pEA-009MeM; Mon, 20 Nov 2023 16:47:33 +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:47:25 +0100 Message-Id: <20231120154731.44988-4-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231120154731.44988-1-stefano.babic@swupdate.org> References: <20231120154731.44988-1-stefano.babic@swupdate.org> MIME-Version: 1.0 X-Provags-ID: V03:K1:T+69UXQTDKMYa+H4V3BGpYXKLXNdZWDeKdXbyf8iWq61eDYehAZ DlG+QF2D+0WrU+n7GPMaPTbJdyFcfTO1GkLLsAYMuaSshB3NvOGL1h91ZjCwZlEwxBETtpW hAssud6vnt60FBwtfHOWAF5b9SSUQckHhv0y8B2+rkCCKE6r0Qsolr27p3zLwASrMGuyzoI UnmonGAt83cws9v4K6fWQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:eMF9E6Vda4s=;NayXVFi7HgGmTZJbec6996UXasP xbT11hp0aesuW/NZtxnS6IQ3LCgSxLvashLrTi8rvsRiZyS6rgqe2TMu4WJ6up5pzV7oGwqxd DgNzwscNV8lvp4icNLLTYPMqIfdvng2T/QTZ9FUyywQmHz3K+MLm49WsSpv43IFA+GGn4d8KU jnlJImm+JjASaeMSwgPA+K5V/jqSo0hTzoUqW8uCcpE0Qngj7VL4it4dJQB1TjdP+KT1AZKxH pR0x4izub3rFsYWHFDNluV7DVF0eBqy4dQ752lCcQKNW84QvgJeZYyO/zyzYCOweW59zwuU/R s735sTUWQ0egSoNH1AAMO2Nvl5kADV3KfyLWT+Q65b/JYAJzFrVsU9mFTMbWMLVRRPptara5O ODsFPbLzB8z4Sco1eOTzYcr1GMz6bxsyvwXfqN8pd61WtKW4PjFsqmpcvVp5B+jnQBS74f2VD BGtb0pDk5+Gkk+ISSTXgEYCxm1NFixNXc+EXg6cGXRl+4QUB/fmQMdcXQYiMLI2115lwFctCa 0LHxAd6gqVw8GH4H0KrqJlwDzSsdOVo91yvpevR3SU8UpxHDO4n5iXVFs1LgPFi7wbisUqqGI c9sjy8fuAKMLFp7ml1w8jceezHFZnmDckrNQo14V1314bgPhqYIPAVP12Ivvd93j/VSsH44f1 U1eEEpygrZDLPTJ8lR7XwUPORVzFLh7VHsMrAr2jyBGEdPwL1C4NIu/vaSQuXzJwmM+JCv0sh Y9xHntLkn30HH6n6QIjT+iEYpe3Z5HzFrvTkzFpNFiUdXMogAURgTna7C8kXEJgiWqd0ijeL6 TSz3JeMnRWWC29TkeL7up3RtAX3h0wrzE/saYia3EG5vKjgfhAXhTSs+Gme7cuSxz5d0tqDu/ hvNsQza1SNgEiBA== 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 212.227.17.13 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);