From patchwork Mon Nov 20 11:10:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 839514 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:400c:c0c::23b; helo=mail-wr0-x23b.google.com; envelope-from=swupdate+bncbcxploxj6ikrblxqzliakgqendnzcii@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="O26xuxHk"; dkim-atps=neutral Received: from mail-wr0-x23b.google.com (mail-wr0-x23b.google.com [IPv6:2a00:1450:400c:c0c::23b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ygQxY6HF4z9s5L for ; Mon, 20 Nov 2017 22:10:41 +1100 (AEDT) Received: by mail-wr0-x23b.google.com with SMTP id o14sf5806844wrf.6 for ; Mon, 20 Nov 2017 03:10:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1511176238; cv=pass; d=google.com; s=arc-20160816; b=GweeVZ3nlmPvMyPmVDYJc0YlIyy0UuN/FcxDnLfrFQQkdqKguRhsOlJ+OcADZrdkU6 vzng2saxzkZh6AWFD7sb191TghQeNpPHUHIDSsu6Us73aIHCqogIL44ovJJE0e3xex8c PxWUB4ZtgQT/u07OY9hcLJns3qFYfv9NH1gLk3pszUFYT234dR0s5cnRoaHo2tQoq/uJ ZeOVA1sp5tb7sWG6pC/vFq7VSg21fXxk543Wr0S+PsvjkejSw6bOg/9+igCjpckXZzMC g7dCDtIH8G2GGmfa9676cXISbFJ2ukn3T4M45UizNxOnwuhb+z6AJWBwWecODhX7mhUv yDlQ== 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:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=V30t5B9oo3HDwsHDGhZIftE3qNLS5cGXn4IjEYYmiXM=; b=JIC1nvrUJUuS9xKJ15Zv5V76dEXgTgi9YAf7V9KUIhtFQXDAlxvwaoIOLMWfiqmjwl G9OgUAFVWMRWmz969kb1PaGFg+wDdiYhBgyCTnP4pQw3hop+4C0GUv1xGQ6FMU8GEOxP FIbbnNejGPtXdp5Hcrl8ZITWRIHOKHdsXYCohk3EQrhPtCuSwfeL3LMSWWUI6MifgpXW qtYHI2A3dHwujRRJGKsHYZUMkrY2OCDpsCdaFUmUIG5QrgYZDhXshJ8ke9Ilb4R8Y6Ml 9TjPGjqD1skOoXU4wTCMXT6rAfYBgCirXSn/ayys40pBvYTWjFF3EN/cjqkvoLsmPWDE RQbg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=V30t5B9oo3HDwsHDGhZIftE3qNLS5cGXn4IjEYYmiXM=; b=O26xuxHkq5vGyGwRZKu+h1mr3bwXmyYGhgyGj8NUZAOfSR4Ro4wlaISOHK3qPpSZ5q Fv6Afmd4/N2ipuPj+nqarWR4SMystVCD7GOeFJZqzkCFCXJZoVnvh9qyvd3gL/Zjq+dY 5QeCIIbCRfdxX187l6uBDSJ/LTj5yrwvLZbOFiTmnC4TOu7B6v+jNoTqgwhHSIbf8GRo iEbaybya53OzwydEDCtNJE3jwqOnj722IgJbLCyV7z8Oaz1dVENhtwRhFzTmS9fNawc8 g94NkBo8Dq8cWROm9CMtf/jBGIFauG3bbqGXN5MzH12fzqMScYeWq1QTvNasMo23yGia TQVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=V30t5B9oo3HDwsHDGhZIftE3qNLS5cGXn4IjEYYmiXM=; b=QPzLKfmP5+2tH4QJnROemR01+26rt2HSy/ZN+pjhQv4e8n7keYJG0l4Zgc2b6UpdPr pWNXT5V/aQYn+EK8o7zh573675oAj2Z+WVplBWcbz2sErYD8qjNaKcprlpO8YwNmgsCw urs0nm7Y8KFktNIkMVVTA12IBHG9B8oy5Di21dYg6wmVBWSfO/z9wrIgGx+dUmhUu72d Gbj6637qcekesm4+/WZ7UPN4HcoQlfUYzP5gcYAvmVZ5OC+aZctI5hWhr76EK1UIfZeA moviItIlQE9j2LB+KmuUVC4st8MGamlOluBvWRqM+N8067v8G8LwmDCzCPxcVNYXX8Gu laUw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AJaThX7DcOVTjx0CkWgGxDok/MT65ZfiGqc2E8m7E5scZT0ZZ9YQSa9X p9Qi6L4SjCvEpPIHuoyfZRQ= X-Google-Smtp-Source: AGs4zMbWypQZwc4BeFsucN06ltnrve0lnIZsczeiKMy+8X0LJcj+o9tQZx8kkP9vqNyGavW3cMzEGQ== X-Received: by 10.28.225.68 with SMTP id y65mr141677wmg.7.1511176238488; Mon, 20 Nov 2017 03:10:38 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.80.167.100 with SMTP id h91ls4960423edc.8.gmail; Mon, 20 Nov 2017 03:10:38 -0800 (PST) X-Received: by 10.80.137.157 with SMTP id g29mr4212201edg.2.1511176238221; Mon, 20 Nov 2017 03:10:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511176238; cv=none; d=google.com; s=arc-20160816; b=L3gCNpKTv/0MyVVou6jt1Mzc2LQ2HvjSBTt1zxQIF7BsdmVpcPqvhXxjNh/77fgX5e VAGEGTulHP1Amd4ZMHjT6bL9QYTKq9QnXb0qqidVbTWbvPsNIpY8gjqOm2mTcCeejb3V V5tr2TsxR2KLcxerXiv63sd1jiCam+1ORVDJzBkV9t+iLDTUwG3qhiYx6ylp4WG22zUz pOO69cQIR/1lneKcIsIRu7IpYs0dXJyqOPalx2vVvqYaTlGvwsOpqmIoHawg2eTSp/yy Nwn6NpL6m/J25eczkijNNgnCP/j/LNtUq2gLbRadmmq47EFu7lCy4vvyAB4wOi0yiYG7 cn7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=ANNXKt4sMn6kEL3p27IRJP3aCIQDpoPf3VZYOCPGRHU=; b=MtpN26oOxS0DSwkSrq7jl3OZPYB/QSW2DOraz+j2jSc3jYorCLahmXGtTthSXuh6jj zr4NRfvTUmE+g7r2PJK4ZZEQLyaCZAQ23MOi7XkLW2Gn9FjSvTNr51PZuY7EKV48a/5h b7OGYK6As7GGr/gVlO0/V5BhAPs3f9+Dw15O+1GaliG1AXHbPpyYFMfWPDEHBh4jz9GW NiYT6YG2PdCHJ26k4ClkBlrdyQCqbql7Pg9OCXA7oDC/bsPYl2asIDfnlQA+elkikNeK r39pfve8WxNY6/xSD+gYljqrn1b0nw6PyOGC7dDpBNeTtJXWSMqDO8h2DOqTPLjBLj6F n7Yw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.10]) by gmr-mx.google.com with ESMTPS id q7si823328edd.0.2017.11.20.03.10.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Nov 2017 03:10:38 -0800 (PST) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) client-ip=212.18.0.10; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3ygQxT6y3Zz1qqkr; Mon, 20 Nov 2017 12:10:37 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3ygQxT6n3Mz1qqkZ; Mon, 20 Nov 2017 12:10:37 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id LRuzxyiM6Q7D; Mon, 20 Nov 2017 12:10:32 +0100 (CET) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Mon, 20 Nov 2017 12:10:32 +0100 (CET) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 1A5FC4540378; Mon, 20 Nov 2017 12:10:32 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YxOcNfN9vLUX; Mon, 20 Nov 2017 12:10:29 +0100 (CET) Received: from papero.fritz.box (papero.fritz.box [192.168.178.132]) by babic.homelinux.org (Postfix) with ESMTP id C4EAC4540633; Mon, 20 Nov 2017 12:10:19 +0100 (CET) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH 08/17] channel_curl: drop reference to hawkbit Date: Mon, 20 Nov 2017 12:10:01 +0100 Message-Id: <1511176210-28928-8-git-send-email-sbabic@denx.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511176210-28928-1-git-send-email-sbabic@denx.de> References: <1511176210-28928-1-git-send-email-sbabic@denx.de> X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de 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: , Function can be used outside hawkbit - rename channel_hawkbit_init() to channel_curl_init(). Signed-off-by: Stefano Babic --- corelib/channel_curl.c | 4 ++-- suricatta/server_hawkbit.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/corelib/channel_curl.c b/corelib/channel_curl.c index 6c16592..073bf16 100644 --- a/corelib/channel_curl.c +++ b/corelib/channel_curl.c @@ -76,7 +76,7 @@ channel_op_res_t channel_set_options(channel_t *this, channel_data_t *channel_da static void channel_log_effective_url(channel_t *this); /* Prototypes for "public" functions */ -channel_op_res_t channel_hawkbit_init(void); +channel_op_res_t channel_curl_init(void); channel_op_res_t channel_close(channel_t *this); channel_op_res_t channel_open(channel_t *this, void *cfg); channel_op_res_t channel_get(channel_t *this, void *data); @@ -85,7 +85,7 @@ channel_op_res_t channel_put(channel_t *this, void *data); channel_t *channel_new(void); -channel_op_res_t channel_hawkbit_init(void) +channel_op_res_t channel_curl_init(void) { #ifdef CONFIG_SURICATTA_SSL #define CURL_FLAGS CURL_GLOBAL_SSL diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c index 186e9f0..100f0a0 100644 --- a/suricatta/server_hawkbit.c +++ b/suricatta/server_hawkbit.c @@ -106,7 +106,7 @@ static hawkbit_enums_t hawkbit_enums[] = { #define ALL_MANDATORY_SET (TENANT_BIT | ID_BIT | URL_BIT) -extern channel_op_res_t channel_hawkbit_init(void); +extern channel_op_res_t channel_curl_init(void); /* Prototypes for "internal" functions */ /* Note that they're not `static` so that they're callable from unit tests. */ json_object *json_get_key(json_object *json_root, const char *key); @@ -1718,7 +1718,7 @@ server_op_res_t server_start(char *fname, int argc, char *argv[]) return SERVER_EINIT; } - if (channel_hawkbit_init() != CHANNEL_OK) + if (channel_curl_init() != CHANNEL_OK) return SERVER_EINIT; /*