On Thu, Jul 11, 2013 at 2:03 AM, Eric Sunshine <sunshine@xxxxxxxxxxxxxx> wrote: > +static const struct option check_mailmap_options[] = { > + OPT_BOOLEAN(0, "stdin", &use_stdin, > + N_("also read contacts from stdin")), > + OPT_BOOLEAN('z', NULL, &null_out, > + N_("null-terminate output lines")), I think OPT_BOOLEAN is deprecated in favor of OPT_BOOL (or OPT_COUNTUP if you really want -z -z -z to mean differently than -z) > + maybe_flush_or_die(stdout, "contact to stdout"); On error this function will print write failure on 'contact to stdout' maybe maybe_flush_or_die(stdout, "write contact to stdout") or something? From i18n point of view, maybe_flush_or_die should not compose a sentence this way. Let the second argument be a complete sentence so that translators have more freedom. But that's a different issue. -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html