From patchwork Mon Dec 16 23:58:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 36901 Received: (qmail 35240 invoked by alias); 16 Dec 2019 23:58:27 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 35231 invoked by uid 89); 16 Dec 2019 23:58:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=sk:with-li, sk:withli X-HELO: mail.efficios.com Received: from mail.efficios.com (HELO mail.efficios.com) (167.114.142.138) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 16 Dec 2019 23:58:26 +0000 Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 6781768BE4C for ; Mon, 16 Dec 2019 18:58:24 -0500 (EST) Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id Fh91rPfgtdJW; Mon, 16 Dec 2019 18:58:24 -0500 (EST) Received: from localhost (ip6-localhost [IPv6:::1]) by mail.efficios.com (Postfix) with ESMTP id 0ACA968BE46; Mon, 16 Dec 2019 18:58:24 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 0ACA968BE46 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1576540704; bh=atD0uZZeXwSq9GXV+JO1B30LfB4iFqCduKRuU4q0gTc=; h=From:To:Date:Message-Id:MIME-Version; b=sMt0T7OmG1/Zlfb5iTPneLxG2eSWDkWpUJU1HVokNPgn5vOKgwGuQ2W6qvCHweIjb TXX3LZW9jVtPYhQ7D5q0YMBNXadD2/Wx41h66jXvO+huj7rBFbMykfHDztVwG2hHOm Dui1Z5vXRMQVsQLt0tZ1GEa7LAPgv3IEW0fa1bnkCvGsb0k1JYQ25JNZojmNDw+VYY OTPrnaj8Wl4fUNFixU75k1IKkaA88TALNujqLrErO40kYdQRnQtMHe9pipR05bV1F7 VLpgdqCKRhBiPkTCJMIKaCgrUIvX8GHxvpqYfPScV6lo0gxEMagQGsnLqmikbfww5O 5OZ+r37ipCoKA== Received: from mail.efficios.com ([IPv6:::1]) by localhost (mail02.efficios.com [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id FrxswYA5hm_c; Mon, 16 Dec 2019 18:58:23 -0500 (EST) Received: from smarchi-efficios.internal.efficios.com (192-222-181-218.qc.cable.ebox.net [192.222.181.218]) by mail.efficios.com (Postfix) with ESMTPSA id DDF4268BE40; Mon, 16 Dec 2019 18:58:23 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH] Fix -Wmisleading-indentation warning in top.c Date: Mon, 16 Dec 2019 18:58:18 -0500 Message-Id: <20191216235818.10307-1-simon.marchi@efficios.com> MIME-Version: 1.0 When building top.c with this clang (daily build from apt.llvm.org): $ clang++-10 --version clang version 10.0.0-+20191211091425+f99297176cd-1~exp1~20191211082036.1372 I get: /home/smarchi/src/binutils-gdb/gdb/top.c:1549:5: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation] fprintf_filtered (stream, _("\n\ ^ /home/smarchi/src/binutils-gdb/gdb/top.c:1543:3: note: previous statement is here if (SYSTEM_GDBINIT_DIR[0]) ^ This looks like a legitimate warning, the fprintf_filtered is too much indented. Fix it, and at the same time add a bit of whitespace to make this function easier to read. gdb/ChangeLog: * top.c (print_gdb_configuration): Adjust indentation. --- gdb/top.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gdb/top.c b/gdb/top.c index bc300e47542a..6f366ffe69df 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1425,10 +1425,12 @@ print_gdb_configuration (struct ui_file *stream) This GDB was configured as follows:\n\ configure --host=%s --target=%s\n\ "), host_name, target_name); + fprintf_filtered (stream, _("\ --with-auto-load-dir=%s\n\ --with-auto-load-safe-path=%s\n\ "), AUTO_LOAD_DIR, AUTO_LOAD_SAFE_PATH); + #if HAVE_LIBEXPAT fprintf_filtered (stream, _("\ --with-expat\n\ @@ -1438,19 +1440,23 @@ This GDB was configured as follows:\n\ --without-expat\n\ ")); #endif + if (GDB_DATADIR[0]) fprintf_filtered (stream, _("\ --with-gdb-datadir=%s%s\n\ "), GDB_DATADIR, GDB_DATADIR_RELOCATABLE ? " (relocatable)" : ""); + #ifdef ICONV_BIN fprintf_filtered (stream, _("\ --with-iconv-bin=%s%s\n\ "), ICONV_BIN, ICONV_BIN_RELOCATABLE ? " (relocatable)" : ""); #endif + if (JIT_READER_DIR[0]) fprintf_filtered (stream, _("\ --with-jit-reader-dir=%s%s\n\ "), JIT_READER_DIR, JIT_READER_DIR_RELOCATABLE ? " (relocatable)" : ""); + #if HAVE_LIBUNWIND_IA64_H fprintf_filtered (stream, _("\ --with-libunwind-ia64\n\ @@ -1460,6 +1466,7 @@ This GDB was configured as follows:\n\ --without-libunwind-ia64\n\ ")); #endif + #if HAVE_LIBLZMA fprintf_filtered (stream, _("\ --with-lzma\n\ @@ -1469,6 +1476,7 @@ This GDB was configured as follows:\n\ --without-lzma\n\ ")); #endif + #if HAVE_LIBBABELTRACE fprintf_filtered (stream, _("\ --with-babeltrace\n\ @@ -1478,6 +1486,7 @@ This GDB was configured as follows:\n\ --without-babeltrace\n\ ")); #endif + #if HAVE_LIBIPT fprintf_filtered (stream, _("\ --with-intel-pt\n\ @@ -1487,6 +1496,7 @@ This GDB was configured as follows:\n\ --without-intel-pt\n\ ")); #endif + #if HAVE_LIBMPFR fprintf_filtered (stream, _("\ --with-mpfr\n\ @@ -1496,6 +1506,7 @@ This GDB was configured as follows:\n\ --without-mpfr\n\ ")); #endif + #ifdef WITH_PYTHON_PATH fprintf_filtered (stream, _("\ --with-python=%s%s\n\ @@ -1505,6 +1516,7 @@ This GDB was configured as follows:\n\ --without-python\n\ ")); #endif + #if HAVE_GUILE fprintf_filtered (stream, _("\ --with-guile\n\ @@ -1514,6 +1526,7 @@ This GDB was configured as follows:\n\ --without-guile\n\ ")); #endif + #if HAVE_SOURCE_HIGHLIGHT fprintf_filtered (stream, _("\ --enable-source-highlight\n\ @@ -1523,30 +1536,36 @@ This GDB was configured as follows:\n\ --disable-source-highlight\n\ ")); #endif + #ifdef RELOC_SRCDIR fprintf_filtered (stream, _("\ --with-relocated-sources=%s\n\ "), RELOC_SRCDIR); #endif + if (DEBUGDIR[0]) fprintf_filtered (stream, _("\ --with-separate-debug-dir=%s%s\n\ "), DEBUGDIR, DEBUGDIR_RELOCATABLE ? " (relocatable)" : ""); + if (TARGET_SYSTEM_ROOT[0]) fprintf_filtered (stream, _("\ --with-sysroot=%s%s\n\ "), TARGET_SYSTEM_ROOT, TARGET_SYSTEM_ROOT_RELOCATABLE ? " (relocatable)" : ""); + if (SYSTEM_GDBINIT[0]) fprintf_filtered (stream, _("\ --with-system-gdbinit=%s%s\n\ "), SYSTEM_GDBINIT, SYSTEM_GDBINIT_RELOCATABLE ? " (relocatable)" : ""); + if (SYSTEM_GDBINIT_DIR[0]) fprintf_filtered (stream, _("\ --with-system-gdbinit-dir=%s%s\n\ "), SYSTEM_GDBINIT_DIR, SYSTEM_GDBINIT_DIR_RELOCATABLE ? " (relocatable)" : ""); - /* We assume "relocatable" will be printed at least once, thus we always - print this text. It's a reasonably safe assumption for now. */ - fprintf_filtered (stream, _("\n\ + + /* We assume "relocatable" will be printed at least once, thus we always + print this text. It's a reasonably safe assumption for now. */ + fprintf_filtered (stream, _("\n\ (\"Relocatable\" means the directory can be moved with the GDB installation\n\ tree, and GDB will still find it.)\n\ "));