[PATCH 1/3] count: Convert to new-style argument parsing

[Jani Nikula]

On Wed, 11 Jan 2012 00:02:51 -0500, Austin Clements <amdragon at MIT.EDU> wrote:
> ---
>  notmuch-count.c |   53 +++++++++++++++++++++++++----------------------------
>  1 files changed, 25 insertions(+), 28 deletions(-)
> 
> diff --git a/notmuch-count.c b/notmuch-count.c
> index 20ce334..fb7401b 100644
> --- a/notmuch-count.c
> +++ b/notmuch-count.c
> @@ -21,6 +21,11 @@
>  
>  #include "notmuch-client.h"
>  
> +typedef enum {
> +    OUTPUT_THREADS,
> +    OUTPUT_MESSAGES,
> +} output_t;
> +
>  int
>  notmuch_count_command (void *ctx, int argc, char *argv[])
>  {
> @@ -28,35 +33,23 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
>      notmuch_database_t *notmuch;
>      notmuch_query_t *query;
>      char *query_str;
> -    int i;
> -    notmuch_bool_t output_messages = TRUE;
> +    int opt_index;
> +    output_t output = OUTPUT_MESSAGES;
>  
> -    argc--; argv++; /* skip subcommand argument */
> +    notmuch_opt_desc_t options[] = {
> +	{ NOTMUCH_OPT_KEYWORD, &output, "output", 'o',
> +	  (notmuch_keyword_t []){ { "threads", OUTPUT_THREADS },
> +				  { "messages", OUTPUT_MESSAGES },
> +				  { 0, 0 } } },

To be pedantic, parse_arguments() expects 'output_var' to be a pointer
to int for NOTMUCH_OPT_KEYWORD. sizeof(enum) is implementation
dependent. I would forget about output_t typedef, use plain enum, and
int type for 'output'.

In fact, this is exactly what I did in commits
e6d89ad723f775952d89d4f81b6072617c5caf18 and
be5619cca32452f1a398add85908d78d6e72f469. In the latter I could have
used notmuch_bool_t because it's a typedeffed int, but then I would've
depended on some external typedef not changing (it probably won't, but
this is defensive programming).

Otherwise, looks good.

BR,
Jani.


> +	{ 0, 0, 0, 0, 0 }
> +    };
>  
> -    for (i = 0; i < argc && argv[i][0] == '-'; i++) {
> -	if (strcmp (argv[i], "--") == 0) {
> -	    i++;
> -	    break;
> -	}
> -	if (STRNCMP_LITERAL (argv[i], "--output=") == 0) {
> -	    const char *opt = argv[i] + sizeof ("--output=") - 1;
> -	    if (strcmp (opt, "threads") == 0) {
> -		output_messages = FALSE;
> -	    } else if (strcmp (opt, "messages") == 0) {
> -		output_messages = TRUE;
> -	    } else {
> -		fprintf (stderr, "Invalid value for --output: %s\n", opt);
> -		return 1;
> -	    }
> -	} else {
> -	    fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
> -	    return 1;
> -	}
> +    opt_index = parse_arguments (argc, argv, options, 1);
> +
> +    if (opt_index < 0) {
> +	return 1;
>      }
>  
> -    argc -= i;
> -    argv += i;
> -
>      config = notmuch_config_open (ctx, NULL, NULL);
>      if (config == NULL)
>  	return 1;
> @@ -66,7 +59,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
>      if (notmuch == NULL)
>  	return 1;
>  
> -    query_str = query_string_from_args (ctx, argc, argv);
> +    query_str = query_string_from_args (ctx, argc-opt_index, argv+opt_index);
>      if (query_str == NULL) {
>  	fprintf (stderr, "Out of memory.\n");
>  	return 1;
> @@ -82,10 +75,14 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
>  	return 1;
>      }
>  
> -    if (output_messages)
> +    switch (output) {
> +    case OUTPUT_MESSAGES:
>  	printf ("%u\n", notmuch_query_count_messages (query));
> -    else
> +	break;
> +    case OUTPUT_THREADS:
>  	printf ("%u\n", notmuch_query_count_threads (query));
> +	break;
> +    }
>  
>      notmuch_query_destroy (query);
>      notmuch_database_close (notmuch);
> -- 
> 1.7.7.3
> 
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch