[PATCH 1/4] cli: ignore config argument of notmuch_help_command

diff --git a/49/16ab10cef8470793f83a1ef3644ff85e2ba370 b/49/16ab10cef8470793f83a1ef3644ff85e2ba370
new file mode 100644 (file)
index 0000000..c7524ed
--- /dev/null
+++ b/49/16ab10cef8470793f83a1ef3644ff85e2ba370
@@ -0,0 +1,89 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 54ADC6DE1ADD\r
+ for <notmuch@notmuchmail.org>; Tue,  7 Apr 2015 12:33:58 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.414\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.414 tagged_above=-999 required=5 tests=[AWL=0.404, \r
+ T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 5jqJFsny7q-X for <notmuch@notmuchmail.org>;\r
+ Tue,  7 Apr 2015 12:33:56 -0700 (PDT)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+ [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 8134C6DE1AFA\r
+ for <notmuch@notmuchmail.org>; Tue,  7 Apr 2015 12:33:56 -0700 (PDT)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+ 4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1YfZEQ-0001yH-UG; Tue, 07 Apr 2015 19:32:18 +0000\r
+Received: (nullmailer pid 16646 invoked by uid 1000); Tue, 07 Apr 2015\r
+ 19:30:48 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Mark Walters <markwalters1009@gmail.com>, David Bremner\r
+ <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: [PATCH 1/4] cli: ignore config argument of notmuch_help_command\r
+Date: Wed,  8 Apr 2015 04:30:39 +0900\r
+Message-Id: <1428435042-16503-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1428435042-16503-1-git-send-email-david@tethera.net>\r
+References: <871tjws8w8.fsf@qmul.ac.uk>\r
+ <1428435042-16503-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 07 Apr 2015 19:33:58 -0000\r
+\r
+We call it with NULL at one point anyway, so it needs to work with\r
+NULL. Since the only place we use talloc is right before exec, there\r
+is no harm in always using NULL.\r
+---\r
+ notmuch.c | 6 +++---\r
+ 1 file changed, 3 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/notmuch.c b/notmuch.c\r
+index a5b2877..31672c3 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -177,7 +177,7 @@ exec_man (const char *page)\r
+ }\r
+ \r
+ static int\r
+-notmuch_help_command (notmuch_config_t *config, int argc, char *argv[])\r
++notmuch_help_command (unused (notmuch_config_t * config), int argc, char *argv[])\r
+ {\r
+     command_t *command;\r
+     help_topic_t *topic;\r
+@@ -202,14 +202,14 @@ notmuch_help_command (notmuch_config_t *config, int argc, char *argv[])\r
+ \r
+     command = find_command (argv[0]);\r
+     if (command) {\r
+-      char *page = talloc_asprintf (config, "notmuch-%s", command->name);\r
++      char *page = talloc_asprintf (NULL, "notmuch-%s", command->name);\r
+       exec_man (page);\r
+     }\r
+ \r
+     for (i = 0; i < ARRAY_SIZE (help_topics); i++) {\r
+       topic = &help_topics[i];\r
+       if (strcmp (argv[0], topic->name) == 0) {\r
+-          char *page = talloc_asprintf (config, "notmuch-%s", topic->name);\r
++          char *page = talloc_asprintf (NULL, "notmuch-%s", topic->name);\r
+           exec_man (page);\r
+       }\r
+     }\r
+-- \r
+2.1.4\r
+\r