Make "internal error, %s overflow" arguments consistent, using

__func__ where possible (when debugging is allowed).

common/alloc.c

@@ -98,7 +98,7 @@ emalloc2(size_t nmemb, size_t size)
     if (nmemb == 0 || size == 0)
 	fatalx_nodebug(_("internal error, tried to emalloc2(0)"));
     if (nmemb > SIZE_MAX / size)
-	fatalx_nodebug(_("internal error, %s overflow"), "emalloc2()");
+	fatalx_nodebug(_("internal error, %s overflow"), "emalloc2");
 
     size *= nmemb;
     if ((ptr = malloc(size)) == NULL)
@@ -120,7 +120,7 @@ ecalloc(size_t nmemb, size_t size)
 	fatalx_nodebug(_("internal error, tried to ecalloc(0)"));
     if (nmemb != 1) {
 	if (nmemb > SIZE_MAX / size)
-	    fatalx_nodebug(_("internal error, %s overflow"), "ecalloc()");
+	    fatalx_nodebug(_("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)
 	fatalx_nodebug(_("internal error, tried to erealloc3(0)"));
     if (nmemb > SIZE_MAX / size)
-	fatalx_nodebug(_("internal error, %s overflow"), "erealloc3()");
+	fatalx_nodebug(_("internal error, %s overflow"), "erealloc3");
 
     size *= nmemb;
     ptr = ptr ? realloc(ptr, size) : malloc(size);
@@ -183,7 +183,7 @@ erecalloc(void *ptr, size_t onmemb, size_t nmemb, size_t msize)
     if (nmemb == 0 || msize == 0)
 	fatalx_nodebug(_("internal error, tried to erecalloc(0)"));
     if (nmemb > SIZE_MAX / msize)
-	fatalx_nodebug(_("internal error, %s overflow"), "erecalloc()");
+	fatalx_nodebug(_("internal error, %s overflow"), "erecalloc");
 
     size = nmemb * msize;
     ptr = ptr ? realloc(ptr, size) : malloc(size);

plugins/sudoers/env.c

@@ -286,12 +286,12 @@ sudo_putenv_nodebug(char *str, bool dupcheck, bool overwrite)
 
 	if (env.env_size > SIZE_MAX - 128) {
 	    fatalx_nodebug(U_("internal error, %s overflow"),
-		"sudo_putenv_nodebug()");
+		"sudo_putenv_nodebug");
 	}
 	nsize = env.env_size + 128;
 	if (nsize > SIZE_MAX / sizeof(char *)) {
 	    fatalx_nodebug(U_("internal error, %s overflow"),
-		"sudo_putenv_nodebug()");
+		"sudo_putenv_nodebug");
 	}
 	nenvp = realloc(env.envp, nsize * sizeof(char *));
 	if (nenvp == NULL) {
@@ -392,7 +392,7 @@ sudo_setenv2(const char *var, const char *val, bool dupcheck, bool overwrite)
 	strlcat(estring, "=", esize) >= esize ||
 	strlcat(estring, val, esize) >= esize) {
 
-	fatalx(U_("internal error, %s overflow"), "sudo_setenv2()");
+	fatalx(U_("internal error, %s overflow"), __func__);
     }
     rval = sudo_putenv(estring, dupcheck, overwrite);
     if (rval == -1)

plugins/sudoers/linux_audit.c

@@ -86,8 +86,7 @@ linux_audit_command(char *argv[], int result)
     for (av = argv; *av != NULL; av++) {
 	n = strlcpy(cp, *av, size - (cp - command));
 	if (n >= size - (cp - command)) {
-	    warningx(U_("internal error, %s overflow"),
+	    warningx(U_("internal error, %s overflow"), __func__);
-		"linux_audit_command()");
 	    goto done;
 	}
 	cp += n;

plugins/sudoers/policy.c

@@ -439,14 +439,14 @@ sudoers_policy_exec_setup(char *argv[], char *envp[], mode_t cmnd_umask,
 	    (unsigned int)runas_pw->pw_gid;
 	len = snprintf(cp, glsize - (cp - gid_list), "%u", egid);
 	if (len < 0 || (size_t)len >= glsize - (cp - gid_list))
-	    fatalx(U_("internal error, %s overflow"), "runas_groups");
+	    fatalx(U_("internal error, %s overflow"), __func__);
 	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 || (size_t)len >= glsize - (cp - gid_list))
-		    fatalx(U_("internal error, %s overflow"), "runas_groups");
+		    fatalx(U_("internal error, %s overflow"), __func__);
 		cp += len;
 	    }
 	}

plugins/sudoers/prompt.c

@@ -158,5 +158,5 @@ expand_prompt(const char *old_prompt, const char *auth_user)
 
 oflow:
     /* We pre-allocate enough space, so this should never happen. */
-    fatalx(U_("internal error, %s overflow"), "expand_prompt()");
+    fatalx(U_("internal error, %s overflow"), __func__);
 }

plugins/sudoers/sudoers.c

@@ -665,7 +665,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))
-			fatalx(U_("internal error, %s overflow"), "set_cmnd()");
+			fatalx(U_("internal error, %s overflow"), __func__);
 		    to += n;
 		    *to++ = ' ';
 		}

plugins/sudoers/testsudoers.c

@@ -238,7 +238,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))
-		fatalx(U_("internal error, %s overflow"), "init_vars()");
+		fatalx(U_("internal error, %s overflow"), getprogname());
 	    to += n;
 	    *to++ = ' ';
 	}