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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-07-30 01:41:03 +0000 (Sat, 30 Jul 2011)
New Revision: 3457

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/usermod.c
Log:
	* src/usermod.c: Add annotations to indicate that fail_exit() does
	not return.
	* src/usermod.c: Fix typo in notreached annotation.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-07-30 01:38:07 UTC (rev 3456)
+++ upstream/trunk/ChangeLog	2011-07-30 01:41:03 UTC (rev 3457)
@@ -1,5 +1,11 @@
 2011-07-30  Nicolas François  <nicolas.francois at 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 at centraliens.net>
+
 	* libmisc/find_new_uid.c: free (used_uids) on return.
 	* libmisc/find_new_gid.c: free (used_gids) on return.
 

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2011-07-30 01:38:07 UTC (rev 3456)
+++ upstream/trunk/src/usermod.c	2011-07-30 01:41:03 UTC (rev 3457)
@@ -159,7 +159,7 @@
 #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 @@
 /*
  * 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 @@
 				break;
 			case 'h':
 				usage (E_SUCCESS);
-				/* @notreached@ */break;
+				/*@notreached@*/break;
 			case 'l':
 				if (!is_valid_user_name (optarg)) {
 					fprintf (stderr,