Message ID | 20231017102257.63826-1-stefano.babic@swupdate.org |
---|---|
State | Accepted |
Headers | show
Return-Path: <swupdate+bncBAABBBOBXGUQMGQE3HGDYVQ@googlegroups.com> 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=aL/a8ALk; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23e; helo=mail-lj1-x23e.google.com; envelope-from=swupdate+bncbaabbbobxguqmgqe3hgdyvq@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x23e.google.com (mail-lj1-x23e.google.com [IPv6:2a00:1450:4864:20::23e]) (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 4S8qn96LSJz20Pd for <incoming@patchwork.ozlabs.org>; Tue, 17 Oct 2023 21:23:08 +1100 (AEDT) Received: by mail-lj1-x23e.google.com with SMTP id 38308e7fff4ca-2c52b2e424fsf13533311fa.1 for <incoming@patchwork.ozlabs.org>; Tue, 17 Oct 2023 03:23:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697538183; cv=pass; d=google.com; s=arc-20160816; b=VomD4DCvCEpiVvdaJGSdHJgL9zrYVohpiauQG2W1BqNV1ASAghPX2cH+K5nJ6HrhOC /H9E8KAVtpoRXMzcN6vkXQdSRy5qQI6ns39TMyhIyDU1HcrICOTHAe23dZiK2sb7PsK3 q1do+ItJ8JaFUlGxFhBcJseleET16IE5Y2QPcxyj7SHH3y5Cn78J/1FT12IMCGWe+6MZ 1lpscJK8PFZ966Sh1tthd5gjYAUZw+rQxbDiaa2KwSVm/mf0UpsImyyG3aZos+xQVFir Hk300a4hP9ey9AQaOcPOs2KHTixIIVrj0roghPb9Cs6EHpGF+67QbO3vQoDretvCkAIW b8Ow== 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 :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:dkim-signature; bh=4K9swuBOwRUwliMrOeicpIy08Tfl+GQjX8Wdw4bQBv8=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=eGJwdKCEjKt0+2NtrpKtfnDPMnxZtD4DRNbLYJfPp54AkrFws70CKhMZLO9hrdZOA3 jqYo5cydYy1qWueTLmPUlqekgkf2dP4DT7W1lurcgSJlgaWdfgAOeG72LhPLN80phZ+W gVynGsU76V3uKgEAluGbHtU58kVo/3sCfu5C09oQ8HJXiJK9TLoiE9E1iMIx5280EqDt 533aF8uTJOUOyjcVEZ6lAjiNAUOZUNZbsAZ5+7hPIchRDdwbH7doVPECS/RbFG2QsIqT KvCBsndqQ43ginJBzvRG70jUZ+1NE41BfvDyRi1kgUZ6CdP5xYSh4jVm0W0cocGFk1Cl kNDA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.75 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=1697538183; x=1698142983; 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:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=4K9swuBOwRUwliMrOeicpIy08Tfl+GQjX8Wdw4bQBv8=; b=aL/a8ALkf61VMJZ5VkuhyAYY+Isa/OmvA98vsGOhe1D1+evXfQp67JXffjgIlmn1Ep rKM2cziwBKTVMixQq9AFV2RJQz4QTiAZ5MwovObKzGv1qK7dy9fVkb2OjJYqJXKkHqhi 4peYOwD1Zbew1vHXkyvqjxhniEWlxXlr9TVlnDwMZo45aVNEGCxMGUwO9ES9VmfPlguT Nh9d4CUXC5kL5Gq2HF/ZALHndJTpjqmoA1DgpabfoubxV/VNnlekpR1VS9PsCdMgVWFk PFC1+PNu7uMoXBk6SkcLGTcCfX0o6MlJowX0uBnDVsmZKA+1PrpR0FUBgQNNaIfHU6Ma Ujlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697538183; x=1698142983; 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:content-transfer-encoding:mime-version:message-id :date:subject:cc:to:from:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=4K9swuBOwRUwliMrOeicpIy08Tfl+GQjX8Wdw4bQBv8=; b=cThs116xDktIK/asKWcZwkJdiq8vDTAWg3DhTIWeHqbYkAPHvKZG4I1AQAI2SR0UmL XKsiqmIZC6DTHCIu007vWcoclipfJxG0ogn7niCC12ujBRtoD69rkMICa22l1/YtARJ0 Q/gPnOLsE8NO5ZyPgbWisTTrfGc101+MYQSTPWpj4ymXaT82vFTFGtq/GPAPokY1YUTE C7nAwKNB3IU4K5LjFnx7bHSACLgqyAqvMSt5EN2qyWtSbskJTQ2VtxJqV5YcVimW9+rB bluvdUS5o6dBxFOENpcyyHImVlhyZdcM5DhnTZ4L+JoZF/tpQJAMRfbkndnHQKwokZqh 5hng== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YzG4A0LlFecGbJZKfqfo8Ln/YofcN9lVH2Gtoi1dIWWCgFYxHiF 1QX5ziP07mKmaKfj4qck7k8= X-Google-Smtp-Source: AGHT+IHSFCEhZQBat0vB186nMdqyZsIvxfM0BhVCtgopa++suhwxQyLR4IbPoSDxKSdMFlA2XEeHzQ== X-Received: by 2002:a05:651c:10ac:b0:2c5:884:88a0 with SMTP id k12-20020a05651c10ac00b002c5088488a0mr566045ljn.21.1697538182614; Tue, 17 Oct 2023 03:23:02 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:9b11:0:b0:2bf:fb2c:fd70 with SMTP id u17-20020a2e9b11000000b002bffb2cfd70ls1259080lji.2.-pod-prod-00-eu; Tue, 17 Oct 2023 03:23:00 -0700 (PDT) X-Received: by 2002:a2e:bc14:0:b0:2c5:6aa:e6ac with SMTP id b20-20020a2ebc14000000b002c506aae6acmr974151ljf.1.1697538180145; Tue, 17 Oct 2023 03:23:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697538180; cv=none; d=google.com; s=arc-20160816; b=mHF1O2ofhXXhnfhFQKksI0+Ncs2vooIKoX0G6inYLtnLyemm0T2W3jmiFJ1PYMOREf SXWg4GLFaMJopO7vBbpymtk57fJZOEJ4E3HZ4fwWVJjd9FPUWc75v5xyA9/rnZOEWI77 Z9F4lPnIkSorcFTd8TK4wFh6F+sGkr5+kWH7JvvXh6WSJe+IIxLr/iqmnNPyli0UpPpu yyM9Wt30eQf0lofr6vOcQQcXT4CBsWqLL8HXA6l5lItECMhcjlEnKI/FFToA6A0rJ4Vn kVbC/+yfKomKYuQNWzRaNbTIJ6i5dols/0CXW9jEvSOD+55TgXfH4tH0p+pCXcQyVjMA 387A== 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:message-id :date:subject:cc:to:from; bh=UQjukrT6wGsiHPfeIyRknz7qcGecl+Ncg8MU1Fv3th4=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=U0WeqSWTZNoL63LU0NWicrVUf/DP/qHElQykF5DMUj54HbYn5bxJ2+pVAy4ywaffj/ +267D7i+WhRIDma/Yl1WsknwNBgiycIZxiM+lWlSpE0j0pbLsfAFO6uKu/fNfaS5U7ge 04X1ZWsmISDlzGhD7nZQMNLic4ajoZC3K0aR26mf6x/VsCPsbYm8O+x16XmlF/gFCTOS DtEEyGp4hZZ06woSBkQSXkMO3sEo4ns/+EbfdK59x0QXY3zv6GCf7Ky/PCP29w2RpsI6 3ioIAf0UWBbowhutL8c3wwDldH6D8RpF8GeLztvQ/HKHTjrn6u9rGROWG3aX/K1ZTDa1 0QGA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.75 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [217.72.192.75]) by gmr-mx.google.com with ESMTPS id c20-20020a2e9d94000000b002c50578f98fsi41869ljj.8.2023.10.17.03.22.59 for <swupdate@googlegroups.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 03:23:00 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 217.72.192.75 as permitted sender) client-ip=217.72.192.75; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue109 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MkYkC-1rFMXV0vuw-00m6Ny; Tue, 17 Oct 2023 12:22:59 +0200 From: Stefano Babic <stefano.babic@swupdate.org> To: swupdate@googlegroups.com Cc: Stefano Babic <stefano.babic@swupdate.org> Subject: [swupdate] [PATCH] Fix warning in channel_settings Date: Tue, 17 Oct 2023 12:22:57 +0200 Message-Id: <20231017102257.63826-1-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:0xzTI/rUH5zwzimkLptFU/PKztgl+8YbR/VVNboqVlHGXvrehUA V1BTWCdsTsXFzE8Nadhu21RaEALC2jGajFScZlRHScn7ObVgxTZntNUq3uVPj0kzgHWkh0A itvHLCZam27Nnh7o4KAIscvCeuz4eroF5BMxahPUlhuVhjby3z32RrlGLNwfTPGatt+FEWo VSmPtHlc6GldpmxhrlmwA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:ZhgBewmmLXQ=;yGAhu2MVPnBcUuVOlqE3KX0f6k1 oO9K2z9+pnV2HT6QQQl39tKvJnCRQKMntWVnM9M3saTEEpliW2uV9i1/Gbr8nHxK25T2wcqyG 6W4fzk3EKhB1R2LAcs7X28rDsGGr9DUIPwAZXmcjQXYuTwIHj+BaFzCSmrjiN6Z3fSwFSAvvO BpjrC9YKlW151Duwkk4dt0vLNYGRR9qA2pZJi1kHAAKLqzc6bxRP2Xv2Dd1/MUHnk1IV0BBlN dscYexTvFloE7QFZ//y4Qhox+GuUd8uYr4SKqOHFNnZnkw9UNZI7xHGw/qcZiz6QMczIQoKjN tMf5fWL6kkj5JzreCU376dsSa1LN2TsnZoW1mYm+oYGNadLoEMdCmq68fd3pHwir8VPAtgVRV IbWtCT9PORwRDk+NXf6D2nc9SUBtWxXPfxeWiQUIv7XlzUbv4PtdxQYBq1+CKt4uDZerFrYAH FVp7rhYtswwyUuD7YzR+ceYrO5Tx/pFNE04mE+QIHwkRIrkOnPY/6Ju9g5vsi0s32FhvrtuyD Vu+hMQBPvJMP0kZmDATt7+T4yVRqY/avTduAEgav+TZd7y9OVPKvWtEZ1EW8FBg0rdn5KK4L9 brXc0+curN9hUCKqrh/e5yZytj7frpSYt5aW0AcUPh5egWY4t1OiHJcWutlqJHXMyZE+vAUwU 5whb/zPJ4gxCig2pqYrzQhrMVMGUrM+rlemc3IU7sMWDDUtzN5Y/8dAsVirGw645CQ1DqUmA/ 7P2zlSGAvsS/eRl+qnV9eM/xpFDfrPi7ITKjNHEJpHsJ/utrOm1iX9HFed4mAJxxG5PSJv4zI Rl218pzTcwgIgrah4g+dU3wT4o5HSxmmcc4DtFzZIFmG5G2YTrvmWU6yVeSO1FRtsxlO/M9ZG R/wb16qCkiDZ17A== 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.75 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: <swupdate.googlegroups.com> X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: <https://groups.google.com/group/swupdate/post>, <mailto:swupdate@googlegroups.com> List-Help: <https://groups.google.com/support/>, <mailto:swupdate+help@googlegroups.com> List-Archive: <https://groups.google.com/group/swupdate List-Subscribe: <https://groups.google.com/group/swupdate/subscribe>, <mailto:swupdate+subscribe@googlegroups.com> List-Unsubscribe: <mailto:googlegroups-manage+605343134186+unsubscribe@googlegroups.com>, <https://groups.google.com/group/swupdate/subscribe> |
Series |
Fix warning in channel_settings
|
expand
|
diff --git a/corelib/server_utils.c b/corelib/server_utils.c index 025a57d6..3c56b50a 100644 --- a/corelib/server_utils.c +++ b/corelib/server_utils.c @@ -15,9 +15,10 @@ #include <channel_curl.h> #include "server_utils.h" -void channel_settings(void *elem, channel_data_t *chan) +int channel_settings(void *elem, void *data) { char tmp[128]; + channel_data_t *chan = (channel_data_t *)data; get_field(LIBCFG_PARSER, elem, "retry", &chan->retries); @@ -48,6 +49,8 @@ void channel_settings(void *elem, channel_data_t *chan) GET_FIELD_STRING_RESET(LIBCFG_PARSER, elem, "interface", tmp); if (strlen(tmp)) SETSTRING(chan->iface, tmp); + + return 0; } server_op_res_t map_channel_retcode(channel_op_res_t response) diff --git a/include/server_utils.h b/include/server_utils.h index 9cca3a90..3b262e59 100644 --- a/include/server_utils.h +++ b/include/server_utils.h @@ -14,6 +14,6 @@ struct json_object; -void channel_settings(void *elem, channel_data_t *chan); +int channel_settings(void *elem, void *data); server_op_res_t map_channel_retcode(channel_op_res_t response); struct json_object *server_tokenize_msg(char *buf, size_t size);
Fix the following warning: handlers/delta_downloader.c:207:64: warning: passing argument 3 of ‘read_module_settings’ from incompatible pointer type [-Wincompatible-pointer-types] 207 | read_module_settings(&handle, "delta", channel_settings, &channel_data); | ^~~~~~~~~~~~~~~~ Signed-off-by: Stefano Babic <stefano.babic@swupdate.org> --- corelib/server_utils.c | 5 ++++- include/server_utils.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)