simple fixes for notmuch-restore

simple fixes for notmuch-restore

[david]

Here are a couple of small fixes I noticed while working on notmuch-restore.

I think the optind increment is harmless (although confusing) and the
other is just correcting an error message.

[PATCH 1/2] notmuch-restore: remove extra increment of optind

[david]

From: David Bremner <bremner@debian.org>

This is left over from when the file name was a positional parameter.
---
 notmuch-restore.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/notmuch-restore.c b/notmuch-restore.c
index 08d5adc..09dd691 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -141,7 +141,6 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
 		     input_file_name, strerror (errno));
 	    return 1;
 	}
-	optind++;
     }
 
     if (opt_index < argc) {
-- 
1.7.10.4

[PATCH 2/2] notmuch-restore: fix error message for extra positional parameter.

[david]

From: David Bremner <bremner@debian.org>

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

Re: simple fixes for notmuch-restore

[Tomi Ollila]

On Thu, Nov 15 2012, david@tethera.net wrote:

> Here are a couple of small fixes I noticed while working on notmuch-restore.
>
> I think the optind increment is harmless (although confusing) and the
> other is just correcting an error message.

LGTM.

Re: simple fixes for notmuch-restore

[David Bremner]

david@tethera.net writes:

> Here are a couple of small fixes I noticed while working on notmuch-restore.

Pushed both.

d