From: "Lu, Han" han.lu@intel.com

Cutting down 6 message strings to 2, as translators need to work on each different variant.

Signed-off-by: Lu, Han han.lu@intel.com

diff --git a/bat/bat.c b/bat/bat.c index 24c74e8..4320e22 100644 --- a/bat/bat.c +++ b/bat/bat.c @@ -41,43 +41,33 @@ static int get_duration(struct bat *bat) char *ptrf, *ptri;

duration_f = strtof(bat->narg, &ptrf); - if (duration_f == HUGE_VALF || duration_f == -HUGE_VALF) { - fprintf(bat->err, _("duration float overflow: %f %d\n"), - duration_f, -errno); - return -errno; - } else if (duration_f == 0.0 && errno != 0) { - fprintf(bat->err, _("duration float underflow: %f %d\n"), - duration_f, -errno); - return -errno; - } + if (duration_f == HUGE_VALF || duration_f == -HUGE_VALF + || (duration_f == 0.0 && errno != 0)) + goto err_exit;

duration_i = strtol(bat->narg, &ptri, 10); - if (duration_i == LONG_MAX) { - fprintf(bat->err, _("duration long overflow: %ld %d\n"), - duration_i, -errno); - return -errno; - } else if (duration_i == LONG_MIN) { - fprintf(bat->err, _("duration long underflow: %ld %d\n"), - duration_i, -errno); - return -errno; - } + if (duration_i == LONG_MAX || duration_i == LONG_MIN) + goto err_exit;

- if (*ptrf == 's') { + if (*ptrf == 's') bat->frames = duration_f * bat->rate; - } else if (*ptri == 0) { + else if (*ptri == 0) bat->frames = duration_i; - } else { - fprintf(bat->err, _("invalid duration: %s\n"), bat->narg); - return -EINVAL; - } + else + bat->frames = -1;

if (bat->frames <= 0 || bat->frames > MAX_FRAMES) { - fprintf(bat->err, _("duration out of range: (0, %d(%ds))\n"), - MAX_FRAMES, (bat->frames / bat->rate)); + fprintf(bat->err, _("Invalid duration. Range: (0, %d(%fs))\n"), + MAX_FRAMES, (double)MAX_FRAMES / bat->rate); return -EINVAL; }

return 0; + +err_exit: + fprintf(bat->err, _("Duration overflow/underflow: %d\n"), -errno); + + return -errno; }

static void get_sine_frequencies(struct bat *bat, char *freq)

From: "Lu, Han" han.lu@intel.com

1. Change comment strings to make the descriptions more clear; 2. Add indent for option lines that have no indent; 3. Use a const string instead of argv[0] as program name.

Signed-off-by: Lu, Han han.lu@intel.com

diff --git a/bat/bat.c b/bat/bat.c index 2320984..2be3efb 100644 --- a/bat/bat.c +++ b/bat/bat.c @@ -268,28 +268,27 @@ static void test_capture(struct bat *bat) } }

-static void usage(struct bat *bat, char *argv[]) +static void usage(struct bat *bat) { fprintf(bat->log, -_("Usage:%s [Option]...\n" +_("Usage: bat [-options]...\n" "\n" -"-h, --help help\n" -"-D sound card\n" -"-P playback pcm\n" -"-C capture pcm\n" -"-f sample size\n" -"-c number of channels\n" -"-r sampling rate\n" -"-n frames to capture\n" -"-k sigma k\n" -"-F target frequency\n" -"-p total number of periods to play/capture\n" -" --log=# path of log file. if not set, logs be put to stdout,\n" -" and errors be put to stderr.\n" -" --file=# input file\n" -" --saveplay=# save playback content to target file, for debug\n" -" --local internal loop, bypass hardware\n" -), argv[0]); +" -h, --help this help\n" +" -D pcm device for both playback and capture\n" +" -P pcm device for playback\n" +" -C pcm device for capture\n" +" -f sample format\n" +" -c number of channels\n" +" -r sampling rate\n" +" -n frames to playback or capture\n" +" -k parameter for frequency detecting threshold\n" +" -F target frequency\n" +" -p total number of periods to play/capture\n" +" --log=# file that both stdout and strerr redirecting to\n" +" --file=# file for playback\n" +" --saveplay=# file that storing playback content, for debug\n" +" --local internal loop, set to bypass pcm hardware devices\n" +)); fprintf(bat->log, _("Recognized sample formats are: %s %s %s %s\n"), snd_pcm_format_name(SND_PCM_FORMAT_U8), snd_pcm_format_name(SND_PCM_FORMAT_S16_LE), @@ -402,7 +401,7 @@ static void parse_arguments(struct bat *bat, int argc, char *argv[]) break; case 'h': default: - usage(bat, argv); + usage(bat); exit(EXIT_SUCCESS); } }