Reduce the number of "internal error, foo overflow" messages that

need to be translated.

diff --git a/common/alloc.c b/common/alloc.c
index cbf8f626f0f8ce72ad9bb8085d9e85104622b2c7..e1fe25843a2e9d5e3042ea7395c70841942febc4 100644 (file)
--- a/common/alloc.c
+++ b/common/alloc.c
@@ -98,7 +98,7 @@ emalloc2(size_t nmemb, size_t size)
     if (nmemb == 0 || size == 0)
        errorx2(1, _("internal error, tried to emalloc2(0)"));
     if (nmemb > SIZE_MAX / size)
-       errorx2(1, _("internal error, emalloc2() overflow"));
+       errorx2(1, _("internal error, %s overflow"), "emalloc2()");
 
     size *= nmemb;
     if ((ptr = malloc(size)) == NULL)
@@ -120,7 +120,7 @@ ecalloc(size_t nmemb, size_t size)
        errorx2(1, _("internal error, tried to ecalloc(0)"));
     if (nmemb != 1) {
        if (nmemb > SIZE_MAX / size)
-           errorx2(1, _("internal error, ecalloc() overflow"));
+           errorx2(1, _("internal error, %s overflow"), "ecalloc()");
        size *= nmemb;
     }
     if ((ptr = malloc(size)) == NULL)
@@ -160,7 +160,7 @@ erealloc3(void *ptr, size_t nmemb, size_t size)
     if (nmemb == 0 || size == 0)
        errorx2(1, _("internal error, tried to erealloc3(0)"));
     if (nmemb > SIZE_MAX / size)
-       errorx2(1, _("internal error, erealloc3() overflow"));
+       errorx2(1, _("internal error, %s overflow"), "erealloc3()");
 
     size *= nmemb;
     ptr = ptr ? realloc(ptr, size) : malloc(size);
@@ -182,9 +182,9 @@ erecalloc(void *ptr, size_t onmemb, size_t nmemb, size_t msize)
     size_t size;
 
     if (nmemb == 0 || msize == 0)
-       errorx2(1, _("internal error, tried to erealloc3(0)"));
+       errorx2(1, _("internal error, tried to erecalloc(0)"));
     if (nmemb > SIZE_MAX / msize)
-       errorx2(1, _("internal error, erealloc3() overflow"));
+       errorx2(1, _("internal error, %s overflow"), "erecalloc()");
 
     size = nmemb * msize;
     ptr = ptr ? realloc(ptr, size) : malloc(size);

diff --git a/plugins/sudoers/check.c b/plugins/sudoers/check.c
index 0d98e4dc8f02bed4c04f7ae12727ca8a022d742d..28f515f2227043dc468b41be27aefc01709877a6 100644 (file)
--- a/plugins/sudoers/check.c
+++ b/plugins/sudoers/check.c
@@ -396,7 +396,7 @@ expand_prompt(char *old_prompt, char *user, char *host)
 
 oflow:
     /* We pre-allocate enough space, so this should never happen. */
-    errorx(1, _("internal error, expand_prompt() overflow"));
+    errorx(1, _("internal error, %s overflow"), "expand_prompt()");
 }
 
 /*

diff --git a/plugins/sudoers/env.c b/plugins/sudoers/env.c
index a9b4f45f1f3c34762e6dd9cc678048d6d80219d2..a776139644191a515ddac21968e2303ae8e20875 100644 (file)
--- a/plugins/sudoers/env.c
+++ b/plugins/sudoers/env.c
@@ -285,11 +285,15 @@ sudo_putenv_nodebug(char *str, bool dupcheck, bool overwrite)
        char **nenvp;
        size_t nsize;
 
-       if (env.env_size > SIZE_MAX - 128)
-           errorx2(1, _("internal error, sudo_putenv_nodebug() overflow"));
+       if (env.env_size > SIZE_MAX - 128) {
+           errorx2(1, _("internal error, %s overflow"),
+               "sudo_putenv_nodebug()");
+       }
        nsize = env.env_size + 128;
-       if (nsize > SIZE_MAX / sizeof(char *))
-           errorx2(1, _("internal error, sudo_putenv_nodebug() overflow"));
+       if (nsize > SIZE_MAX / sizeof(char *)) {
+           errorx2(1, _("internal error, %s overflow"),
+               "sudo_putenv_nodebug()");
+       }
        nenvp = realloc(env.envp, nsize * sizeof(char *));
        if (nenvp == NULL) {
            errno = ENOMEM;
@@ -388,7 +392,7 @@ sudo_setenv2(const char *var, const char *val, bool dupcheck, bool overwrite)
        strlcat(estring, "=", esize) >= esize ||
        strlcat(estring, val, esize) >= esize) {
 
-       errorx(1, _("internal error, sudo_setenv2() overflow"));
+       errorx(1, _("internal error, %s overflow"), "sudo_setenv2()");
     }
     rval = sudo_putenv(estring, dupcheck, overwrite);
     if (rval == -1)
@@ -440,7 +444,7 @@ sudo_setenv(const char *var, const char *val, int overwrite)
     rval = sudo_setenv_nodebug(var, val, overwrite);
     if (rval == -1) {
        if (errno == EINVAL)
-           errorx(1, _("internal error, sudo_setenv() overflow"));
+           errorx(1, _("internal error, %s overflow"), "sudo_setenv()");
        errorx(1, _("unable to allocate memory"));
     }
     debug_return_int(rval);

diff --git a/plugins/sudoers/linux_audit.c b/plugins/sudoers/linux_audit.c
index 71f9e5e73526f274d0c9f495b225d1b5a776be36..9cfd4a7a67f5f74eb314f53dd0312891b70f106d 100644 (file)
--- a/plugins/sudoers/linux_audit.c
+++ b/plugins/sudoers/linux_audit.c
@@ -78,8 +78,10 @@ linux_audit_command(char *argv[], int result)
     command = cp = emalloc(size);
     for (av = argv; *av != NULL; av++) {
        n = strlcpy(cp, *av, size - (cp - command));
-       if (n >= size - (cp - command))
-           errorx(1, _("internal error, linux_audit_command() overflow"));
+       if (n >= size - (cp - command)) {
+           errorx(1, _("internal error, %s overflow"),
+               "linux_audit_command()");
+       }
        cp += n;
        *cp++ = ' ';
     }

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index 1c011a876c8f92203b7be2d2c94e984e34f99042..b33628ca4e2e5802ec48e1cc8e57e50884a0eee7 100644 (file)
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -667,14 +667,14 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
            (unsigned int)runas_pw->pw_gid;
        len = snprintf(cp, glsize - (cp - gid_list), "%u", egid);
        if (len < 0 || len >= glsize - (cp - gid_list))
-           errorx(1, _("internal error, runas_groups overflow"));
+           errorx(1, _("internal error, %s overflow"), "runas_groups");
        cp += len;
        for (i = 0; i < grlist->ngids; i++) {
            if (grlist->gids[i] != egid) {
                len = snprintf(cp, glsize - (cp - gid_list), ",%u",
                     (unsigned int) grlist->gids[i]);
                if (len < 0 || len >= glsize - (cp - gid_list))
-                   errorx(1, _("internal error, runas_groups overflow"));
+                   errorx(1, _("internal error, %s overflow"), "runas_groups");
                cp += len;
            }
        }
@@ -933,7 +933,7 @@ set_cmnd(void)
                for (to = user_args, av = NewArgv + 1; *av; av++) {
                    n = strlcpy(to, *av, size - (to - user_args));
                    if (n >= size - (to - user_args))
-                       errorx(1, _("internal error, set_cmnd() overflow"));
+                       errorx(1, _("internal error, %s overflow"), "set_cmnd()");
                    to += n;
                    *to++ = ' ';
                }

diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index 576458c1a70be67773d501ed7ed4401f7e7120c7..148dd6e5302ad70b1e1dc85af33d84ce5b27f30d 100644 (file)
--- a/plugins/sudoers/testsudoers.c
+++ b/plugins/sudoers/testsudoers.c
@@ -250,7 +250,7 @@ main(int argc, char *argv[])
        for (to = user_args, from = argv; *from; from++) {
            n = strlcpy(to, *from, size - (to - user_args));
            if (n >= size - (to - user_args))
-                   errorx(1, _("internal error, init_vars() overflow"));
+               errorx(1, _("internal error, %s overflow"), "init_vars()");
            to += n;
            *to++ = ' ';
        }