Rework common badusage strings to allow for possible translation reuse

Use cmdinfo long name instead of hard-coding it in the literal string,
and reword some strings to make them more generally usable.

2 files changed, 5 insertions, 3 deletions

diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index b5802cdb4..60f0ddb82 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -406,7 +406,8 @@ do_build(const char *const *argv)
   if (debar != NULL) {
     struct stat debarstab;
 
-    if (*argv) badusage(_("--build takes at most two arguments"));
+    if (*argv)
+      badusage(_("--%s takes at most two arguments"), cipaction->olong);
 
     if (stat(debar, &debarstab)) {
       if (errno != ENOENT)
diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index d7dfeb5b1..5c1a1531f 100644
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -323,9 +323,10 @@ do_field(const char *const *argv)
 int
 do_contents(const char *const *argv)
 {
-  const char *debar;
+  const char *debar = *argv++;
 
-  if (!(debar= *argv++) || *argv) badusage(_("--contents takes exactly one argument"));
+  if (debar == NULL || *argv)
+    badusage(_("--%s takes exactly one argument"), cipaction->olong);
   extracthalf(debar, NULL, "tv", 0);
 
   return 0;