[Pkg-shadow-commits] r2764 - in upstream/trunk: . libmisc

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-23 11:14:18 +0000 (Thu, 23 Apr 2009)
New Revision: 2764

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/libmisc/age.c
Log:
	* libmisc/age.c: Use exit(EXIT_FAILURE) instead of exit(1).
	* libmisc/age.c: The return value of execl() is not used.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-23 09:57:03 UTC (rev 2763)
+++ upstream/trunk/ChangeLog	2009-04-23 11:14:18 UTC (rev 2764)
@@ -1,5 +1,10 @@
 2009-04-22  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* libmisc/age.c: Use exit(EXIT_FAILURE) instead of exit(1).
+	* libmisc/age.c: The return value of execl() is not used.
+
+2009-04-22  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/xgetXXbyYY.c, libmisc/myname.c, libmisc/getgr_nam_gid.c,
 	libmisc/salt.c, libmisc/list.c, libmisc/cleanup.c, src/login.c,
 	lib/getdef.h, lib/groupio.c, lib/getlong.c, lib/gshadow_.h,

Modified: upstream/trunk/libmisc/age.c
===================================================================
--- upstream/trunk/libmisc/age.c	2009-04-23 09:57:03 UTC (rev 2763)
+++ upstream/trunk/libmisc/age.c	2009-04-23 11:14:18 UTC (rev 2764)
@@ -92,7 +92,7 @@
 
 	if ((status > 1) || (sp->sp_max < sp->sp_min)) {
 		(void) puts (_("  Contact the system administrator."));
-		exit (1);
+		exit (EXIT_FAILURE);
 	}
 	(void) puts (_("  Choose a new password."));
 	(void) fflush (stdout);
@@ -135,13 +135,13 @@
 			_exit (126);
 		}
 
-		execl (PASSWD_PROGRAM, PASSWD_PROGRAM, pw->pw_name, (char *) 0);
+		(void) execl (PASSWD_PROGRAM, PASSWD_PROGRAM, pw->pw_name, (char *) 0);
 		err = errno;
 		perror ("Can't execute " PASSWD_PROGRAM);
 		_exit ((ENOENT == err) ? E_CMD_NOTFOUND : E_CMD_NOEXEC);
 	} else if ((pid_t) -1 == pid) {
 		perror ("fork");
-		exit (1);
+		exit (EXIT_FAILURE);
 	}
 
 	while (((child = wait (&status)) != pid) && (child != (pid_t)-1));
@@ -150,8 +150,8 @@
 		return 1;
 	}
 
-	exit (1);
- /*NOTREACHED*/}
+	exit (EXIT_FAILURE);
+ /*@notreached@*/}
 
 /*
  * agecheck - see if warning is needed for password expiration