From de81b24662a219247b71d493a807c542edf4ec9f Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@gmail.com>
Date: Sat, 28 May 2011 09:49:05 -0400
Subject: [PATCH] Unify messages

Some shell scripts unnecessarily used different formats for some
messages.  Unify them to reduce the work of translators.
---
 ChangeLog          | 3 +++
 debug/xtrace.sh    | 4 ++--
 malloc/memusage.sh | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 188fc9065d..4a288d173c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-28  Ulrich Drepper  <drepper@gmail.com>
 
+	* debug/xtrace.sh: Unify messages.
+	* malloc/memusage.sh: Likewise.
+
 	[BZ #12813]
 	* sysdeps/unix/sysv/linux/x86_64/init-first.c (__vdso_time): Retrieve
 	time symbol from vDSO.  Substitute with vsyscall if not available.
diff --git a/debug/xtrace.sh b/debug/xtrace.sh
index f2e9e22fee..5cb193ab5a 100755
--- a/debug/xtrace.sh
+++ b/debug/xtrace.sh
@@ -30,13 +30,13 @@ do_usage() {
 
 # Refer to --help option.
 help_info() {
-  printf >&2 $"Try \`xtrace --help' for more information.\n"
+  printf >&2 $"Try \`%s --help' or `%s --usage' for more information.\n" xtrace xtrace
   exit 1
 }
 
 # Message for missing argument.
 do_missing_arg() {
-  printf >&2 $"xtrace: option \`$1' requires an argument.\n"
+  printf >&2 $"%s: option '%s' requires an argument.\n" xtrace "$1"
   help_info
 }
 
diff --git a/malloc/memusage.sh b/malloc/memusage.sh
index 757629241f..f1ccbb4d19 100755
--- a/malloc/memusage.sh
+++ b/malloc/memusage.sh
@@ -24,13 +24,13 @@ TEXTDOMAIN=libc
 
 # Print usage message.
 do_usage() {
-  echo >&2 $"Try \`memusage --help' for more information."
+  printf >&2 $"Try \`%s --help' or `%s --usage' for more information.\n" memusage memusage
   exit 1
 }
 
 # Message for missing argument.
 do_missing_arg() {
-  echo >&2 $"memusage: option \`$1' requires an argument"
+  printf >&2 $"%s: option '%s' requires an argument\n" memusage "$1"
   do_usage
 }