Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 539BE431FBF for ; Wed, 14 Nov 2012 18:42:52 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VhT6jidcypff for ; Wed, 14 Nov 2012 18:42:52 -0800 (PST) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id E7C30431FBD for ; Wed, 14 Nov 2012 18:42:51 -0800 (PST) Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net ([156.34.89.108] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TYpPl-0007ec-VR; Wed, 14 Nov 2012 22:42:50 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1TYpPg-0007Ss-A0; Wed, 14 Nov 2012 22:42:44 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [PATCH 2/2] notmuch-restore: fix error message for extra positional parameter. Date: Wed, 14 Nov 2012 22:42:39 -0400 Message-Id: <1352947359-28181-3-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1352947359-28181-1-git-send-email-david@tethera.net> References: <1352947359-28181-1-git-send-email-david@tethera.net> X-Spam_bar: - Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 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: Thu, 15 Nov 2012 02:42:52 -0000 From: David Bremner Note that a single positional parameter will take this code path also, so the old message really makes no sense anymore. --- notmuch-restore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/notmuch-restore.c b/notmuch-restore.c index 09dd691..7d8f44c 100644 --- a/notmuch-restore.c +++ b/notmuch-restore.c @@ -145,8 +145,8 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) if (opt_index < argc) { fprintf (stderr, - "Cannot read dump from more than one file: %s\n", - argv[optind]); + "Unused positional parameter: %s\n", + argv[opt_index]); return 1; } -- 1.7.10.4