[Pkg-shadow-commits] r3387 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-07-14 13:29:22 +0000 (Thu, 14 Jul 2011)
New Revision: 3387

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/usermod.c
Log:
	* src/usermod.c: usage() does not return. Add annotations.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-07-14 13:29:16 UTC (rev 3386)
+++ upstream/trunk/ChangeLog	2011-07-14 13:29:22 UTC (rev 3387)
@@ -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 at centraliens.net>
 

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2011-07-14 13:29:16 UTC (rev 3386)
+++ upstream/trunk/src/usermod.c	2011-07-14 13:29:22 UTC (rev 3387)
@@ -152,7 +152,7 @@
 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 @@
 /*
  * 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 @@
 				break;
 			case 'h':
 				usage (E_SUCCESS);
-				break;
+				/* @notreached@ */break;
 			case 'l':
 				if (!is_valid_user_name (optarg)) {
 					fprintf (stderr,