From patchwork Tue Jan 16 15:09:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 861686 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:4010:c07::23e; helo=mail-lf0-x23e.google.com; envelope-from=swupdate+bncbdd6bwv65qpbblnm7djakgqev2cun4a@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="hpYxR0Ct"; dkim-atps=neutral Received: from mail-lf0-x23e.google.com (mail-lf0-x23e.google.com [IPv6:2a00:1450:4010:c07::23e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zLYbP4KR5z9s7v for ; Wed, 17 Jan 2018 02:11:44 +1100 (AEDT) Received: by mail-lf0-x23e.google.com with SMTP id m79sf2441581lfm.17 for ; Tue, 16 Jan 2018 07:11:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1516115501; cv=pass; d=google.com; s=arc-20160816; b=rzHi+KqnEDIqXxkNfZfMobs5C2Hz96O3lJGkKgjVinZAsRivJB36BcqxuH+h6lWtk4 38Y98pKOfXj+KKpW8an7eVSk19PTsLDMXqylt4PT9w1J6PAIF7EcB1XLBRg1X6YUNeB4 xV7uRXZcz0rbx4+rnA+ze4dhgVz2Hz4M1Gcs8+p0KpRCasJBI9VYH7hQvc0bIUOgX5QK 6pZPK6mqliZrEJg5q8QWOXw4w2PdHT2Jk0qo994aNGHtpdNj6/MSMW51hgSgL7pfv623 Ul4YVfeOmvlDDNlNIxjK/in6Zm+HswsGsmo0Kf3mtKXyoNXc6XAU+274DKrsssit6C6e 9lbw== 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:message-id:date:subject:cc:to:from :arc-authentication-results:arc-message-signature:mime-version :sender:dkim-signature:arc-authentication-results; bh=fU+YmY7qQZFP5sTGzZ8tuXfjvBNbMKaDfQXELw1NlZo=; b=f11IZwDg6YGUzWp07pBK2bLdjrFIbQWIqPHQL/KHqv/Nj0WzxmGl4ivTAkSjdMNXD1 r1RUf7KX72KpNmbzNrnrgCoz6F1OLxmHNat8C7c/WhJPCt3Q4yyCncoxrYz4tt2mHaRm iEqIX7xkQ7F9nuhg7aqanNXg7HZxNvNuor6Er+p4eD1nE60tNjKNwCEBa8DhdbdTyD9p nEmPZuTgTnR00DycmsuY3s0AtAdGqOgubDvRKW1U1lTpUjvLxXnuM33imryzSudMR7Gl lbNbNMGVstuCRRf+d/QQESomGnx27kSzh8KF9SMZLHKbersh9jhQ/MUcoppF8s+1Ruli lfWg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com 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 :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=fU+YmY7qQZFP5sTGzZ8tuXfjvBNbMKaDfQXELw1NlZo=; b=hpYxR0CtJZNleKplSUy1RkXJB4Qx/XLJife08m9Izl15fFBTqdHUp/iNBZn7KzTTLe 38vaPuoKyqAFWn1VDzI00wBxfB1QmSKINyT/lKmMpkNZH0wkQnFyc1UQByXiHAKyK4SD NVCwqszm1jFXEsRynev7c1Az3JDHAKiphKk8e+I4rqY8DE/w6flLQ+SuMOqm4IQgpplU ZW1EYucA4JhzEH9XqOOWUErs6Mnqn1dWXrNUy3kjz79VXVJqG0ctOKITrdi2l4b3KBDu 4wRtydAEwJr5vJyvNrEYcIdQd5Hodavs0FQFNgULDmdcWf5oZkoGzldCCwrjH1TVki7L UW5g== 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: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=fU+YmY7qQZFP5sTGzZ8tuXfjvBNbMKaDfQXELw1NlZo=; b=ZlgTbRFhn7gt4kQ52juxDdXB8sdeI2xB3oxJ4eV6MN6xtjTuP30yhQIY6J1f5tceIa grwkJEvYWOJUayukrSd2GCXO7Ktxn5qaDIiazMgGM1TNLfyA9cPyKYK076Hr4lvzg8uz nq8dskKHgIyjTL5jU6oTL/6m/T+FQ2gastD7XM4qzj5yxiFFrkxi7Zv1ReYq4551daFY 4uGo1lWTioWoGtM3BX5V67i473iz00J92GHFMjsBsWMoKFB7IALiE/k/VnYo9y+U9lEt BNVL6tsJv0MLf+fw7TN3maDAYFBHakk6I6WjC273P166Pzhxq7QpPHsp9VhOjivkH8oe /j6A== Sender: swupdate@googlegroups.com X-Gm-Message-State: AKwxytcVtsPst6mw/7bAhhQKDipEG2CzfZg5i7w7VYmQjY/Y/Z04NDf1 a3U5tuO9bwGOkrWgfyP4gAU= X-Google-Smtp-Source: ACJfBouVF7Rqgad1j/q1nUNlxqqFskDnkJrm0+bDLLroRXFKYMdxmUx7abtZoYAZWL0P2TJWqvZaeA== X-Received: by 10.46.53.15 with SMTP id z15mr103581ljz.0.1516115501834; Tue, 16 Jan 2018 07:11:41 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.25.242.66 with SMTP id d2ls227691lfk.11.gmail; Tue, 16 Jan 2018 07:11:40 -0800 (PST) X-Received: by 10.25.233.24 with SMTP id g24mr1259806lfh.29.1516115500931; Tue, 16 Jan 2018 07:11:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516115500; cv=none; d=google.com; s=arc-20160816; b=LUfTrvyHRYbOdNrwPAqB8IE+CIQ8dyDswvmU3wKLQG5ODhAl1V42zXbmgySBabwSRo 1XM4HXMoT6DQ9gQFkEny5dTqvCSMyfcf+QRqTtXQWWmmrb6/lpN9Iq/9E+MH8tKDUbFx UfzSE+5OnpmsTJ1DnNohE3KPkyxnYxzH7T3EHUNXRCET0JUjx47AWFAd6340+7xBgIUP Pl/DskjKeswa5+o4RguOKtf7De5ls8KmKYMJkqrJ4E4EC0am3HRo73yI6kxIqqv3B4os 9zgPduZgSqXHhF/HYKuizybDuXwf9UxwRV6kgi6OqiJIf0WPqYnZ0FRWlrr9DxBGkEDL 39Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=QBReWXHhssOhK0NcjKOZotp0727tSVmBLZSUplZQNsI=; b=SlboGleeS03hP3gGPkbqSsAVoTGv8hlDKYkcSr+jXXPwzXC/xYarNGs3NK7agk4Tsy xCm8eUCKLVuLREmWy60EgdwMZYe5Qnt3ullcqiKL1qWTnekWuOgC4kI/syQLmdlTTokj KY3IdQ60s6AGO8zac+un//fXnGikBGUIetsQb5wkPXa9vHNZNw37kOd7hmRAy5xVDBMK +m8eGvbQ60yeutaOsmdywFQHRpzc8kNb2LtnynUTkhXKXi7VdrdDUtUncCHiVk/4fIcH ZKk/+0Kv6RkZ+cFD3GZ+uUeJku8gVj7YcicVUfQYJuLMSCflGnvavLBa/elgmvqt6Us/ Xc4g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id k24si330191ljk.5.2018.01.16.07.11.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 07:11:40 -0800 (PST) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w0GFBeAf013204 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 16 Jan 2018 16:11:40 +0100 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.251]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w0GFBeSi001285; Tue, 16 Jan 2018 16:11:40 +0100 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH] Fix Wsign-compare for int with ARRAY_SIZE() comparison Date: Tue, 16 Jan 2018 16:09:02 +0100 Message-Id: <20180116150902.20137-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.15.1 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.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: , include/util.h's ARRAY_SIZE() uses a sizeof() calculation which returns unsigned int. Hence fix Wsign-compare by making the comparison variable unsigned int. Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- corelib/installer.c | 6 ++---- corelib/stream_interface.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/corelib/installer.c b/corelib/installer.c index 4f58794..592923d 100644 --- a/corelib/installer.c +++ b/corelib/installer.c @@ -423,11 +423,10 @@ static void remove_sw_file(char __attribute__ ((__unused__)) *fname) static void cleaup_img_entry(struct img_type *img) { char *fn; - int i; const char *tmp[] = { get_tmpdirscripts(), get_tmpdir() }; if (img->fname[0]) { - for (i = 0; i < ARRAY_SIZE(tmp); i++) { + for (unsigned int i = 0; i < ARRAY_SIZE(tmp); i++) { if (asprintf(&fn, "%s%s", tmp[i], img->fname) == ENOMEM_ASPRINTF) { ERROR("Path too long: %s%s", tmp[i], img->fname); } else { @@ -444,7 +443,6 @@ void cleanup_files(struct swupdate_cfg *software) { struct img_type *img; struct hw_type *hw; const char* TMPDIR = get_tmpdir(); - int count; struct imglist *list[] = {&software->scripts, &software->bootscripts}; LIST_FOREACH(img, &software->images, next) { @@ -459,7 +457,7 @@ void cleanup_files(struct swupdate_cfg *software) { free(img); } - for (count = 0; count < ARRAY_SIZE(list); count++) { + for (unsigned int count = 0; count < ARRAY_SIZE(list); count++) { LIST_FOREACH(img, list[count], next) { cleaup_img_entry(img); diff --git a/corelib/stream_interface.c b/corelib/stream_interface.c index 98b8ca9..a5fd4a1 100644 --- a/corelib/stream_interface.c +++ b/corelib/stream_interface.c @@ -173,13 +173,11 @@ static int extract_files(int fd, struct swupdate_cfg *software) break; } - int i; - struct imglist *list[] = {&software->images, &software->scripts, &software->bootscripts}; - for (i = 0; i < ARRAY_SIZE(list); i++) { + for (unsigned int i = 0; i < ARRAY_SIZE(list); i++) { skip = check_if_required(list[i], &fdh, (list[i] == &software->images) ? &software->installed_sw_list : NULL,