aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-05-28 09:49:05 -0400
committerUlrich Drepper <drepper@gmail.com>2011-05-28 09:49:05 -0400
commitde81b24662a219247b71d493a807c542edf4ec9f (patch)
tree3200dd6920fdffc5da04359415fb048b12f5cd45
parentc738465a4c13370f58b797a82cdf1c67e1121867 (diff)
downloadglibc-de81b24662a219247b71d493a807c542edf4ec9f.zip
glibc-de81b24662a219247b71d493a807c542edf4ec9f.tar.gz
glibc-de81b24662a219247b71d493a807c542edf4ec9f.tar.bz2
Unify messages
Some shell scripts unnecessarily used different formats for some messages. Unify them to reduce the work of translators.
-rw-r--r--ChangeLog3
-rwxr-xr-xdebug/xtrace.sh4
-rwxr-xr-xmalloc/memusage.sh4
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 188fc90..4a288d1 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 f2e9e22..5cb193a 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 7576292..f1ccbb4 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
}