From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Thu, 14 Jul 2011 13:29:22 +0000 (+0000)
Subject: 	* src/usermod.c: usage() does not return. Add annotations.
X-Git-Tag: 4.1.5~163
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2798e35d86c5287e6b900d2e455ed2a5d6ae6048;p=shadow

	* src/usermod.c: usage() does not return. Add annotations.
---

diff --git a/ChangeLog b/ChangeLog
index c3da1a82..aef33d88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
 	requested.
 	* src/usermod.c (process_flags): Check for oflg is not needed to
 	check if changes are needed.
+	* src/usermod.c: usage() does not return. Add annotations.
 
 2011-07-08  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/src/usermod.c b/src/usermod.c
index 684e00a6..34e279b2 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -152,7 +152,7 @@ static bool sgr_locked = false;
 static void date_to_str (char *buf, size_t maxsize,
                          long int date, const char *negativ);
 static int get_groups (char *);
-static void usage (int status);
+static /*@noreturn@*/void usage (int status);
 static void new_pwent (struct passwd *);
 #ifdef WITH_SELINUX
 static void selinux_update_mapping (void);
@@ -303,7 +303,7 @@ static int get_groups (char *list)
 /*
  * usage - display usage message and exit
  */
-static void usage (int status)
+static /*@noreturn@*/void usage (int status)
 {
 	fprintf ((E_SUCCESS != status) ? stderr : stdout,
 	         _("Usage: usermod [options] LOGIN\n"
@@ -919,7 +919,7 @@ static void process_flags (int argc, char **argv)
 				break;
 			case 'h':
 				usage (E_SUCCESS);
-				break;
+				/* @notreached@ */break;
 			case 'l':
 				if (!is_valid_user_name (optarg)) {
 					fprintf (stderr,