From 911cf1b6bec31ac89ad28a3368d961b5e3f6ad5c Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Wed, 13 Apr 2016 21:32:47 +0300 Subject: [PATCH] [PATCH 2/4] configure: SC2059: Don't use variables in the printf format string. --- 51/826acdca520689d86bcd21d22d19bc4b450307 | 142 ++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 51/826acdca520689d86bcd21d22d19bc4b450307 diff --git a/51/826acdca520689d86bcd21d22d19bc4b450307 b/51/826acdca520689d86bcd21d22d19bc4b450307 new file mode 100644 index 000000000..dbe2c44a4 --- /dev/null +++ b/51/826acdca520689d86bcd21d22d19bc4b450307 @@ -0,0 +1,142 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 562A46DE034D + for ; Wed, 13 Apr 2016 11:34:25 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: -0.562 +X-Spam-Level: +X-Spam-Status: No, score=-0.562 tagged_above=-999 required=5 tests=[AWL=0.158, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, + RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 637gw7bnmzmi for ; + Wed, 13 Apr 2016 11:34:17 -0700 (PDT) +Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com + [74.125.82.67]) by arlo.cworth.org (Postfix) with ESMTPS id 3833D6DE0159 for + ; Wed, 13 Apr 2016 11:34:08 -0700 (PDT) +Received: by mail-wm0-f67.google.com with SMTP id a140so16473382wma.2 + for ; Wed, 13 Apr 2016 11:34:08 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=nikula-org.20150623.gappssmtp.com; s=20150623; + h=from:to:cc:subject:date:message-id:in-reply-to:references + :in-reply-to:references; + bh=ZQtMu6syqmdLFdv5757KBmnTFlOVdvvf836rTLryWIM=; + b=LfXOVA3169+KoQg0p5ewsembQXtQjQ4yZJGHRR0YVENwftn7g6yggP+3hvSKQW2PFg + HyD5ViyS8BfqvQB8IGbEFhXJrchkDk+2Mm4ktlwyYXOqMGT2INebPwOhHJV9/DXQG0f6 + pQQ3dEEacPermzqCsUo6hbJGRJ573XLBHJ2K7hozGazFS7NYD90ufNjOmNvT2TkX0MB0 + DXIzeKJFps6gTPzbzlC0tVlVxz/pxIkY2jUTQBjU/ahcqX6Qqz7miOmYc0A1FCDF/hrn + KjdEL6BgtWtDdu5tv6KkQNrMykX+0CVNW8n/eQ4Ym9Oq5ro/hvuoHBtzpkHUo0z9g1Ll + iH6g== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:in-reply-to:references; + bh=ZQtMu6syqmdLFdv5757KBmnTFlOVdvvf836rTLryWIM=; + b=FAKstrF29HMv9mtvlRCkaka+YLF9nWLCFMXzXBnOYyiQ19wfCsKudqm2F8F1cUrWPZ + AADteMLtusT+kuPi9ooG6IjK2DuO8CDei90f/geQR4I/ODHiKY0G32wtFtG7Bc1Au3D5 + bvcDppYbQqm8Hw7FdP1KEuQFa2LY6lIh21eP/+64Q9ziVUXf2tNteoFnMsnwCDntOLiz + ggPZ2EhHD5SHcSiovDzUuw9dPET6VhKDwkw/NUK1804BIoFC/+2gdFLxIc6sOuK05WDZ + 7X57fVUKP1C2UVmFFGaoNNlzx0rRhzCPPgA2PfVd/xmh138QnLfHSYh/ZtCIwh1v6R9P + SBFg== +X-Gm-Message-State: + AOPr4FWMpc69/ToEvw5wlTQLpH9Xt3kHfBBVEseOJuw7rGdOtI5iPgHERoe3JW60B0Xb2w== +X-Received: by 10.28.172.132 with SMTP id v126mr12403703wme.28.1460572446845; + Wed, 13 Apr 2016 11:34:06 -0700 (PDT) +Received: from localhost (mobile-access-bcee7f-102.dhcp.inet.fi. + [188.238.127.102]) + by smtp.gmail.com with ESMTPSA id f186sm22317390wmf.24.2016.04.13.11.34.06 + (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 13 Apr 2016 11:34:06 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH 2/4] configure: SC2059: Don't use variables in the printf + format string. +Date: Wed, 13 Apr 2016 21:32:47 +0300 +Message-Id: + +X-Mailer: git-send-email 2.1.4 +In-Reply-To: +References: +In-Reply-To: +References: +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 13 Apr 2016 18:34:25 -0000 + +Fix shellcheck warnings. Use printf "..%s.." "$foo". +--- + configure | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index 0c6cdb01bbe0..d4f56b905cce 100755 +--- a/configure ++++ b/configure +@@ -387,7 +387,7 @@ EOF + else + default_xapian_backend=chert + fi +- printf "${default_xapian_backend}\n"; ++ printf "%s\n" "${default_xapian_backend}"; + rm -rf test.db _default_backend _default_backend.cc + fi + # we need to have a version >= 2.6.5 to avoid a crypto bug. We need +@@ -461,7 +461,7 @@ for name in ${PYTHON} python python2 python3; do + if command -v $name > /dev/null; then + have_python=1 + python=$name +- printf "Yes ($name).\n" ++ printf "Yes (%s).\n" "$name" + break + fi + done +@@ -560,11 +560,11 @@ elif [ $uname = "OpenBSD" ] ; then + platform=OPENBSD + linker_resolves_library_dependencies=0 + elif [ $uname = "Linux" ] || [ $uname = "GNU" ] ; then +- printf "$uname\n" ++ printf "%s\n" "$uname" + platform="$uname" + linker_resolves_library_dependencies=1 + +- printf "Checking for $libdir_expanded in ldconfig... " ++ printf "Checking for %s in ldconfig... " "$libdir_expanded" + ldconfig_paths=$(/sbin/ldconfig -N -X -v 2>/dev/null | sed -n -e 's,^\(/.*\):\( (.*)\)\?$,\1,p') + # Separate ldconfig_paths only on newline (not on any potential + # embedded space characters in any filenames). Note, we use a +@@ -815,7 +815,7 @@ for flag in -Wall -Wextra -Wwrite-strings; do + WARN_CXXFLAGS="${WARN_CXXFLAGS}${WARN_CXXFLAGS:+ }${flag}" + fi + done +-printf "\n\t${WARN_CXXFLAGS}\n" ++printf "\n\t%s\n" "${WARN_CXXFLAGS}" + + WARN_CFLAGS="${WARN_CXXFLAGS}" + printf "Checking for available C compiler warning flags... " +@@ -825,7 +825,7 @@ for flag in -Wmissing-declarations; do + WARN_CFLAGS="${WARN_CFLAGS}${WARN_CFLAGS:+ }${flag}" + fi + done +-printf "\n\t${WARN_CFLAGS}\n" ++printf "\n\t%s\n" "${WARN_CFLAGS}" + + rm -f minimal minimal.c _libversion.c _libversion _libversion.sh + +-- +2.1.4 + -- 2.26.2