From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 26 13:22:52 2015 Received: (at submit) by debbugs.gnu.org; 26 Jun 2015 17:22:52 +0000 Received: from localhost ([127.0.0.1]:58378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z8XL2-0007YZ-3h for submit@debbugs.gnu.org; Fri, 26 Jun 2015 13:22:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42212) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z8XKz-0007YN-QI for submit@debbugs.gnu.org; Fri, 26 Jun 2015 13:22:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z8XKt-0001Q9-4U for submit@debbugs.gnu.org; Fri, 26 Jun 2015 13:22:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:34156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8XKt-0001Px-2N for submit@debbugs.gnu.org; Fri, 26 Jun 2015 13:22:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8XKs-000449-7j for bug-grep@gnu.org; Fri, 26 Jun 2015 13:22:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z8XKr-0001Ot-A1 for bug-grep@gnu.org; Fri, 26 Jun 2015 13:22:42 -0400 Received: from mail-yk0-x22c.google.com ([2607:f8b0:4002:c07::22c]:34061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z8XKr-0001Op-5j for bug-grep@gnu.org; Fri, 26 Jun 2015 13:22:41 -0400 Received: by ykfy125 with SMTP id y125so64522060ykf.1 for ; Fri, 26 Jun 2015 10:22:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:message-id:subject:to:content-type; bh=pTzP4F3J8aoklb+3CYf3KKit8ePrn/lA9QXBX01pklU=; b=DpE1DAExBNOD8devz+jd7Ld+WXoEAV8eLizzdrGGyzGlIlZQQTTPNIuPCRw79MZDdY K7jcr/Iactk5j29gDIVMd23NQHEZuEtrJLCq9YPyjgjLesOsGt1jnxUblPk+Pn/4lWIl UZ+y8s2GDdhyy3iy68+q/GNpz0FLhlKL5jKPTdvDIH7Fw6D61EqvuqVKnLy7JJLmT1pe fdcG/N+S/igSPe8QSw9uyA8shtGzBFTIdGIHiyw1E6MwGGgKigcveyxklkOdtxFWpoQQ VRxFp/ZM2fWwoX10PQeM5AYNq8QBZbpj15HTgpG8n2nF++27Qg6zPoxdiKZd14YqA0ee +6rQ== X-Received: by 10.170.53.87 with SMTP id 84mr3361555ykv.68.1435339360410; Fri, 26 Jun 2015 10:22:40 -0700 (PDT) MIME-Version: 1.0 Received: by 10.37.201.66 with HTTP; Fri, 26 Jun 2015 10:22:20 -0700 (PDT) From: Jim Meyering Date: Fri, 26 Jun 2015 10:22:20 -0700 X-Google-Sender-Auth: vUcDSYSByRmpRsHhUOH7RVxtK0c Message-ID: Subject: FYI: maint: unify three argv-processing calls To: bug-grep@gnu.org Content-Type: multipart/mixed; boundary=001a113951d6b6324d05196efc3e X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) --001a113951d6b6324d05196efc3e Content-Type: text/plain; charset=UTF-8 I've attached a small patch that unifies the three calls to grep_commandline_arg in grep.c's main: I've also pushed an even less substantial patch to alphabetize some enum names, here: http://git.savannah.gnu.org/cgit/grep.git/commit/?id=f240c9477c7d76b74dbbc9390c727d49d3c7bc88 --001a113951d6b6324d05196efc3e Content-Type: application/octet-stream; name="0001-maint-unify-three-argv-processing-calls.patch" Content-Disposition: attachment; filename="0001-maint-unify-three-argv-processing-calls.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ibdvy8cu0 RnJvbSA4MTU3MWM3MThkYzA2NDU2MWI5OWUyNTA4MjViZDkzNDQ0Y2VjNGFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gTWV5ZXJpbmcgPG1leWVyaW5nQGZiLmNvbT4KRGF0ZTog TW9uLCAxMSBNYXkgMjAxNSAwODowNzoyMCAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIG1haW50OiB1 bmlmeSB0aHJlZSBhcmd2LXByb2Nlc3NpbmcgY2FsbHMKCiogc3JjL2dyZXAuYyAobWFpbik6IFVu aWZ5IHRocmVlIGNhbGxzIHRvIGdyZXBfY29tbWFuZGxpbmVfYXJnLgotLS0KIHNyYy9ncmVwLmMg fCAxOSArKysrKysrKysrKysrLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygr KSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvZ3JlcC5jIGIvc3JjL2dyZXAuYwpp bmRleCA0YzNhYTI4Li43N2RkY2U1IDEwMDY0NAotLS0gYS9zcmMvZ3JlcC5jCisrKyBiL3NyYy9n cmVwLmMKQEAgLTI1ODksMjAgKzI1ODksMjcgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2 KQogICBpZiAoZnRzX29wdGlvbnMgJiBGVFNfTE9HSUNBTCAmJiBkZXZpY2VzID09IFJFQURfQ09N TUFORF9MSU5FX0RFVklDRVMpCiAgICAgZGV2aWNlcyA9IFJFQURfREVWSUNFUzsKCisgIGNoYXIg KipmaWxlczsKICAgaWYgKG9wdGluZCA8IGFyZ2MpCiAgICAgewotICAgICAgb2sgPSB0cnVlOwot ICAgICAgZG8KLSAgICAgICAgb2sgJj0gZ3JlcF9jb21tYW5kX2xpbmVfYXJnIChhcmd2W29wdGlu ZF0pOwotICAgICAgd2hpbGUgKCsrb3B0aW5kIDwgYXJnYyk7CisgICAgICBmaWxlcyA9IGFyZ3Yg KyBvcHRpbmQ7CiAgICAgfQogICBlbHNlIGlmIChkaXJlY3RvcmllcyA9PSBSRUNVUlNFX0RJUkVD VE9SSUVTICYmIHByZXBlbmRlZCA8IGxhc3RfcmVjdXJzaXZlKQogICAgIHsKKyAgICAgIHN0YXRp YyBjaGFyICpjd2Rfb25seVtdID0geyAoY2hhciAqKSAiLiIsIE5VTEwgfTsKKyAgICAgIGZpbGVz ID0gY3dkX29ubHk7CiAgICAgICBvbWl0X2RvdF9zbGFzaCA9IHRydWU7Ci0gICAgICBvayA9IGdy ZXBfY29tbWFuZF9saW5lX2FyZyAoIi4iKTsKICAgICB9CiAgIGVsc2UKLSAgICBvayA9IGdyZXBf Y29tbWFuZF9saW5lX2FyZyAoIi0iKTsKKyAgICB7CisgICAgICBzdGF0aWMgY2hhciAqc3RkaW5f b25seVtdID0geyAoY2hhciAqKSAiLSIsIE5VTEwgfTsKKyAgICAgIGZpbGVzID0gc3RkaW5fb25s eTsKKyAgICB9CisKKyAgb2sgPSB0cnVlOworICBkbworICAgIG9rICY9IGdyZXBfY29tbWFuZF9s aW5lX2FyZyAoKmZpbGVzKyspOworICB3aGlsZSAoKmZpbGVzICE9IE5VTEwpOwoKICAgLyogV2Ug cmVnaXN0ZXIgdmlhIGF0ZXhpdCgpIHRvIHRlc3Qgc3Rkb3V0LiAgKi8KICAgZXhpdCAoZXJyc2Vl biA/IEVYSVRfVFJPVUJMRSA6IG9rKTsKLS0gCjIuMy43Cgo= --001a113951d6b6324d05196efc3e-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 26 16:37:53 2015 Received: (at 20905-done) by debbugs.gnu.org; 26 Jun 2015 20:37:53 +0000 Received: from localhost ([127.0.0.1]:58448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z8aNk-00057U-Lq for submit@debbugs.gnu.org; Fri, 26 Jun 2015 16:37:53 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:58594) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z8aNi-00057H-5e for 20905-done@debbugs.gnu.org; Fri, 26 Jun 2015 16:37:51 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 25AAA1601EA; Fri, 26 Jun 2015 13:37:44 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id Vg8MRoFZFjmj; Fri, 26 Jun 2015 13:37:43 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 572A9160821; Fri, 26 Jun 2015 13:37:43 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id n1XDjWir7yCO; Fri, 26 Jun 2015 13:37:43 -0700 (PDT) Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 38D1F1601EA; Fri, 26 Jun 2015 13:37:43 -0700 (PDT) Message-ID: <558DB817.3010209@cs.ucla.edu> Date: Fri, 26 Jun 2015 13:37:43 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Jim Meyering , 20905-done@debbugs.gnu.org Subject: Re: bug#20905: FYI: maint: unify three argv-processing calls References: In-Reply-To: Content-Type: multipart/mixed; boundary="------------090807030209000107040103" X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: 20905-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.4 (-) This is a multi-part message in MIME format. --------------090807030209000107040103 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Thanks, I followed up with the attached cleanup of various minor issues in the neighborhood. --------------090807030209000107040103 Content-Type: text/x-diff; name="0001-grep-minor-tweaks.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-grep-minor-tweaks.patch" >From 60e0b1ab8c78a75b3ebe836264804bb4c363ba7f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 26 Jun 2015 13:34:51 -0700 Subject: [PATCH] grep: minor tweaks * src/grep.c (main): Change recently-added static vars to be constants, which makes them sharable. Prefer 'return' to 'exit' when returning/exiting from 'main'. Move decl closer to first use and rename local from 'ok' (which was confusing) to 'status'. Prefer named constant STDOUT_FILENO to unnamed constant 1. --- src/grep.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/grep.c b/src/grep.c index 77ddce5..6f43284 100644 --- a/src/grep.c +++ b/src/grep.c @@ -2153,7 +2153,7 @@ main (int argc, char **argv) { char *keys; size_t keycc, oldcc, keyalloc; - bool with_filenames, ok; + bool with_filenames; size_t cc; int opt, prepended; int prev_optind, last_recursive; @@ -2514,7 +2514,7 @@ main (int argc, char **argv) { version_etc (stdout, program_name, PACKAGE_NAME, VERSION, AUTHORS, (char *) NULL); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } if (show_help) @@ -2579,39 +2579,38 @@ main (int argc, char **argv) #ifdef SET_BINARY /* Output is set to binary mode because we shouldn't convert NL to CR-LF pairs, especially when grepping binary files. */ - if (!isatty (1)) - SET_BINARY (1); + if (!isatty (STDOUT_FILENO)) + SET_BINARY (STDOUT_FILENO); #endif if (max_count == 0) - exit (EXIT_FAILURE); + return EXIT_FAILURE; if (fts_options & FTS_LOGICAL && devices == READ_COMMAND_LINE_DEVICES) devices = READ_DEVICES; - char **files; + char *const *files; if (optind < argc) { files = argv + optind; } else if (directories == RECURSE_DIRECTORIES && prepended < last_recursive) { - static char *cwd_only[] = { (char *) ".", NULL }; + static char *const cwd_only[] = { (char *) ".", NULL }; files = cwd_only; omit_dot_slash = true; } else { - static char *stdin_only[] = { (char *) "-", NULL }; + static char *const stdin_only[] = { (char *) "-", NULL }; files = stdin_only; } - ok = true; + bool status = true; do - ok &= grep_command_line_arg (*files++); + status &= grep_command_line_arg (*files++); while (*files != NULL); /* We register via atexit() to test stdout. */ - exit (errseen ? EXIT_TROUBLE : ok); + return errseen ? EXIT_TROUBLE : status; } -/* vim:set shiftwidth=2: */ -- 2.1.0 --------------090807030209000107040103-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 26 17:18:32 2015 Received: (at 20905-done) by debbugs.gnu.org; 26 Jun 2015 21:18:32 +0000 Received: from localhost ([127.0.0.1]:58482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z8b16-00065a-31 for submit@debbugs.gnu.org; Fri, 26 Jun 2015 17:18:32 -0400 Received: from mail-yk0-f175.google.com ([209.85.160.175]:33200) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z8b14-00065L-9G for 20905-done@debbugs.gnu.org; Fri, 26 Jun 2015 17:18:30 -0400 Received: by ykdt186 with SMTP id t186so69805233ykd.0 for <20905-done@debbugs.gnu.org>; Fri, 26 Jun 2015 14:18:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=h9QPV4B86W9gX4wrSSx+c8cWCXS3lIMfjOZeduA28OQ=; b=TQafk6XNtz+jIuMZSkGPsUe7QGTov+cjEV3IZuuX15kUcrtOMUI9w3bo2ouIQyvITT 9hWap21d1PL5OdZax1wLrEnRqT//rlt5Z4Cp/GFeHbzdDV+RLt4VhaQmPsMhMqapm29c czhxUHSgFmS5GLGH2g0HC1sSvjtPnIlSYJgeYXMcfFbv2Of15gUgBgmyIgiVGtd13Wnq qahCAckr6OJT9rNuWKdfACs6xIkEYGLPMl33G589l/dan39GQh1320JHoRo5n67l8MQX 5PTcmkO5u4KCm8yTdMcPQ1SJaoQmYxAyxXGSlcapa+4vH+sZhZZoib6o1cneUBiK/yPv 5KMQ== X-Received: by 10.129.133.70 with SMTP id v67mr4217257ywf.158.1435353504769; Fri, 26 Jun 2015 14:18:24 -0700 (PDT) MIME-Version: 1.0 Received: by 10.37.201.66 with HTTP; Fri, 26 Jun 2015 14:18:05 -0700 (PDT) In-Reply-To: <558DB817.3010209@cs.ucla.edu> References: <558DB817.3010209@cs.ucla.edu> From: Jim Meyering Date: Fri, 26 Jun 2015 14:18:05 -0700 X-Google-Sender-Auth: E68f0GAx6c5noyMP8xA5QO1yWag Message-ID: Subject: Re: bug#20905: FYI: maint: unify three argv-processing calls To: Paul Eggert Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 20905-done Cc: 20905-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Fri, Jun 26, 2015 at 1:37 PM, Paul Eggert wrote: > Thanks, I followed up with the attached cleanup of various minor issues in > the neighborhood. Thanks. Especially appreciated: the s/ok/status/ renaming. From unknown Fri Jun 20 07:11:16 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 25 Jul 2015 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator