* src/usermod.c: Add annotations to indicate that fail_exit() does

	not return.
	* src/usermod.c: Fix typo in notreached annotation.

diff --git a/ChangeLog b/ChangeLog
index 964cd958d1f8e2b5819734089c37b24114d51607..04cb863fe414412faf4f577a02ba8caba46b7989 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-30  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/usermod.c: Add annotations to indicate that fail_exit() does
+       not return.
+       * src/usermod.c: Fix typo in notreached annotation.
+
 2011-07-30  Nicolas François  <nicolas.francois@centraliens.net>
 
        * libmisc/find_new_uid.c: free (used_uids) on return.

diff --git a/src/usermod.c b/src/usermod.c
index 16092e2afb712626c83b5059e80cb113bb94cc7c..12d20184e92d37f9069efc9798edd2298e855ac7 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -159,7 +159,7 @@ static void selinux_update_mapping (void);
 #endif
 
 static void new_spent (struct spwd *);
-static void fail_exit (int);
+static /*@noreturn@*/void fail_exit (int);
 static void update_group (void);
 
 #ifdef SHADOWGRP
@@ -557,7 +557,7 @@ static void new_spent (struct spwd *spent)
 /*
  * fail_exit - exit with an error code after unlocking files
  */
-static void fail_exit (int code)
+static /*@noreturn@*/void fail_exit (int code)
 {
        if (gr_locked) {
                if (gr_unlock () == 0) {
@@ -967,7 +967,7 @@ static void process_flags (int argc, char **argv)
                                break;
                        case 'h':
                                usage (E_SUCCESS);
-                               /* @notreached@ */break;
+                               /*@notreached@*/break;
                        case 'l':
                                if (!is_valid_user_name (optarg)) {
                                        fprintf (stderr,