Change some error/errorx -> fatal/fatalx in comments and xgettext

flags.

diff --git a/Makefile.in b/Makefile.in
index 719b2714b34d64c6698e76c4e5255fd415f3a76a..a4d3971971e75a1957690549ad3392f241ae8b55 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,7 @@ XGETTEXT_OPTS = -F -k_ -kN_ --copyright-holder="Todd C. Miller" \
                "--msgid-bugs-address=http://www.sudo.ws/bugs" \
                --package-name=@PACKAGE_NAME@ --package-version=$(VERSION) \
                --flag warning:1:c-format --flag warningx:1:c-format \
-               --flag error:2:c-format --flag errorx:2:c-format \
+               --flag fatal:2:c-format --flag fatalx:2:c-format \
                --flag easprintf:3:c-format --flag lbuf_append:2:c-format \
                --flag lbuf_append_quoted:3:c-format --foreign-user
 

diff --git a/plugins/sudoers/iolog.c b/plugins/sudoers/iolog.c
index b75aa7789f3812ffbd9f096b7a6bb00b5ce4c5fc..7a99b4afbdee702466a4487ae9043a6e56e47301 100644 (file)
--- a/plugins/sudoers/iolog.c
+++ b/plugins/sudoers/iolog.c
@@ -536,7 +536,7 @@ sudoers_io_open(unsigned int version, sudo_conv_t conversation,
     memset(&details, 0, sizeof(details));
 
     if (fatal_setjmp() != 0) {
-       /* called via error(), errorx() or log_fatal() */
+       /* called via fatal(), fatalx() or log_fatal() */
        rval = -1;
        goto done;
     }
@@ -629,7 +629,7 @@ sudoers_io_close(int exit_status, int error)
     debug_decl(sudoers_io_close, SUDO_DEBUG_PLUGIN)
 
     if (fatal_setjmp() != 0) {
-       /* called via error(), errorx() or log_fatal() */
+       /* called via fatal(), fatalx() or log_fatal() */
        fatal_disable_setjmp();
        debug_return;
     }
@@ -653,7 +653,7 @@ sudoers_io_version(int verbose)
     debug_decl(sudoers_io_version, SUDO_DEBUG_PLUGIN)
 
     if (fatal_setjmp() != 0) {
-       /* called via error(), errorx() or log_fatal() */
+       /* called via fatal(), fatalx() or log_fatal() */
        fatal_disable_setjmp();
        debug_return_bool(-1);
     }
@@ -676,7 +676,7 @@ sudoers_io_log(const char *buf, unsigned int len, int idx)
     gettimeofday(&now, NULL);
 
     if (fatal_setjmp() != 0) {
-       /* called via error(), errorx() or log_fatal() */
+       /* called via fatal(), fatalx() or log_fatal() */
        fatal_disable_setjmp();
        debug_return_bool(-1);
     }

diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c
index f3f62564660e53533f7a7e75064bae7dfb0932cd..b956a18b66e726791f0f8fdffc881215605eebb5 100644 (file)
--- a/plugins/sudoers/policy.c
+++ b/plugins/sudoers/policy.c
@@ -497,7 +497,7 @@ sudoers_policy_open(unsigned int version, sudo_conv_t conversation,
        args = NULL;
 
     if (fatal_setjmp() != 0) {
-       /* called via error(), errorx() or log_fatal() */
+       /* called via fatal(), fatalx() or log_fatal() */
        rewind_perms();
        fatal_disable_setjmp();
        debug_return_bool(-1);
@@ -516,7 +516,7 @@ sudoers_policy_close(int exit_status, int error_code)
     debug_decl(sudoers_policy_close, SUDO_DEBUG_PLUGIN)
 
     if (fatal_setjmp() != 0) {
-       /* called via error(), errorx() or log_fatal() */
+       /* called via fatal(), fatalx() or log_fatal() */
        fatal_disable_setjmp();
        debug_return;
     }
@@ -566,7 +566,7 @@ sudoers_policy_init_session(struct passwd *pwd, char **user_env[])
        user_env = NULL;
 
     if (fatal_setjmp() != 0) {
-       /* called via error(), errorx() or log_fatal() */
+       /* called via fatal(), fatalx() or log_fatal() */
        fatal_disable_setjmp();
        debug_return_bool(-1);
     }
@@ -661,7 +661,7 @@ sudoers_policy_version(int verbose)
     debug_decl(sudoers_policy_version, SUDO_DEBUG_PLUGIN)
 
     if (fatal_setjmp() != 0) {
-       /* error recovery via error(), errorx() or log_fatal() */
+       /* error recovery via fatal(), fatalx() or log_fatal() */
        fatal_disable_setjmp();
        debug_return_bool(-1);
     }

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index db10ad1ae6b90cc4d44152ba479f9821e2488c2d..c06907cea6dcdbc05f96fb0f88edcc4766f1602a 100644 (file)
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -129,7 +129,7 @@ sudoers_policy_init(void *info, char * const envp[])
     sudo_setpwent();
     sudo_setgrent();
 
-    /* Register error/errorx callback. */
+    /* Register fatal/fatalx callback. */
     fatal_callback_register(sudoers_cleanup);
 
     /* Initialize environment functions (including replacements). */
@@ -217,7 +217,7 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
 
     /* XXX - would like to move this to policy.c but need the cleanup. */
     if (fatal_setjmp() != 0) {
-       /* error recovery via error(), errorx() or log_fatal() */
+       /* error recovery via fatal(), fatalx() or log_fatal() */
        rval = -1;
        goto done;
     }
@@ -891,7 +891,7 @@ cb_sudoers_locale(const char *locale)
 }
 
 /*
- * Cleanup hook for error()/errorx()
+ * Cleanup hook for fatal()/fatalx()
  */
 void
 sudoers_cleanup(void)

diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c
index 83028c6037a4a959f602458d472421b4fdf9cb17..8cd9488bd1990f3a9e1e7ba79b5eaa800191a6f7 100644 (file)
--- a/plugins/sudoers/sudoreplay.c
+++ b/plugins/sudoers/sudoreplay.c
@@ -267,7 +267,7 @@ main(int argc, char *argv[])
     bindtextdomain("sudoers", LOCALEDIR); /* XXX - should have sudoreplay domain */
     textdomain("sudoers");
 
-    /* Register error/errorx callback. */
+    /* Register fatal/fatalx callback. */
     fatal_callback_register(sudoreplay_cleanup);
 
     /* Read sudo.conf. */
@@ -956,7 +956,7 @@ session_compare(const void *v1, const void *v2)
     return strcmp(s1, s2);
 }
 
-/* XXX - always returns 0, calls error() on failure */
+/* XXX - always returns 0, calls fatal() on failure */
 static int
 find_sessions(const char *dir, REGEX_T *re, const char *user, const char *tty)
 {
@@ -1039,7 +1039,7 @@ find_sessions(const char *dir, REGEX_T *re, const char *user, const char *tty)
     debug_return_int(0);
 }
 
-/* XXX - always returns 0, calls error() on failure */
+/* XXX - always returns 0, calls fatal() on failure */
 static int
 list_sessions(int argc, char **argv, const char *pattern, const char *user,
     const char *tty)
@@ -1205,7 +1205,7 @@ help(void)
 }
 
 /*
- * Cleanup hook for error()/errorx()
+ * Cleanup hook for fatal()/fatalx()
   */
 static void
 sudoreplay_cleanup(void)

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index 214e5521d67a7760f68c9d74149be83abc40bc3e..b5958c1eb7770cd99d81a88d6aa6d698f377eb2d 100644 (file)
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -162,7 +162,7 @@ main(int argc, char *argv[])
     if (argc < 1)
        usage(1);
 
-    /* Register error/errorx callback. */
+    /* Register fatal/fatalx callback. */
     fatal_callback_register(visudo_cleanup);
 
     /* Read sudo.conf. */

diff --git a/src/exec_pty.c b/src/exec_pty.c
index 92ab06d2a6c56c082bb9b0c1ffbdae974c0137db..f8940e5be8221b6e4bb80e3d477d0164cd5bbc6e 100644 (file)
--- a/src/exec_pty.c
+++ b/src/exec_pty.c
@@ -107,7 +107,7 @@ static int safe_close(int fd);
 static void check_foreground(void);
 
 /*
- * Cleanup hook for error()/errorx()
+ * Cleanup hook for fatal()/fatalx()
  */
 static void
 pty_cleanup(void)

diff --git a/src/sudo.h b/src/sudo.h
index 492f19518444031c46423d12a603f9ce194c5646..703e3980b85496845f1ff941de6053d501743224 100644 (file)
--- a/src/sudo.h
+++ b/src/sudo.h
@@ -171,7 +171,7 @@ struct command_status {
 
 struct timeval;
 
-/* For error() and errorx() (XXX - needed?) */
+/* For fatal() and fatalx() (XXX - needed?) */
 void cleanup(int);
 
 /* tgetpass.c */