[Pkg-shadow-commits] r1553 - in upstream/trunk: . src
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Sat Dec 29 11:34:32 UTC 2007
Author: nekral-guest
Date: 2007-12-29 11:34:31 +0000 (Sat, 29 Dec 2007)
New Revision: 1553
Modified:
upstream/trunk/ChangeLog
upstream/trunk/src/chage.c
Log:
Avoid assignments in comparisons.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2007-12-29 11:19:39 UTC (rev 1552)
+++ upstream/trunk/ChangeLog 2007-12-29 11:34:31 UTC (rev 1553)
@@ -10,6 +10,7 @@
information to the audit_logger.
* src/chage.c: Avoid implicit brackets.
* src/chage.c: Avoid implicit conversion to booleans.
+ * src/chage.c: Avoid assignments in comparisons.
2007-12-28 Nicolas François <nicolas.francois at centraliens.net>
Modified: upstream/trunk/src/chage.c
===================================================================
--- upstream/trunk/src/chage.c 2007-12-29 11:19:39 UTC (rev 1552)
+++ upstream/trunk/src/chage.c 2007-12-29 11:34:31 UTC (rev 1553)
@@ -157,14 +157,16 @@
snprintf (buf, sizeof buf, "%ld", mindays);
change_field (buf, sizeof buf, _("Minimum Password Age"));
- if (((mindays = strtol (buf, &cp, 10)) == 0 && ('\0' != *cp))
+ mindays = strtol (buf, &cp, 10);
+ if ( ((mindays == 0) && ('\0' != *cp))
|| (mindays < -1)) {
return 0;
}
snprintf (buf, sizeof buf, "%ld", maxdays);
change_field (buf, sizeof buf, _("Maximum Password Age"));
- if (((maxdays = strtol (buf, &cp, 10)) == 0 && ('\0' != *cp))
+ maxdays = strtol (buf, &cp, 10);
+ if ( ((maxdays == 0) && ('\0' != *cp))
|| (maxdays < -1)) {
return 0;
}
@@ -175,20 +177,25 @@
if (strcmp (buf, EPOCH) == 0) {
lastday = -1;
- } else if ((lastday = strtoday (buf)) == -1) {
- return 0;
+ } else {
+ lastday = strtoday (buf);
+ if (lastday == -1) {
+ return 0;
+ }
}
snprintf (buf, sizeof buf, "%ld", warndays);
change_field (buf, sizeof buf, _("Password Expiration Warning"));
- if (((warndays = strtol (buf, &cp, 10)) == 0 && ('\0' != *cp))
+ warndays = strtol (buf, &cp, 10);
+ if ( ((warndays == 0) && ('\0' != *cp))
|| (warndays < -1)) {
return 0;
}
snprintf (buf, sizeof buf, "%ld", inactdays);
change_field (buf, sizeof buf, _("Password Inactive"));
- if (((inactdays = strtol (buf, &cp, 10)) == 0 && ('\0' != *cp))
+ inactdays = strtol (buf, &cp, 10);
+ if ( ((inactdays == 0) && ('\0' != *cp))
|| (inactdays < -1)) {
return 0;
}
@@ -200,8 +207,11 @@
if (strcmp (buf, EPOCH) == 0) {
expdays = -1;
- } else if ((expdays = strtoday (buf)) == -1) {
- return 0;
+ } else {
+ expdays = strtoday (buf);
+ if (expdays == -1) {
+ return 0;
+ }
}
return 1;
@@ -606,7 +616,8 @@
open_files (lflg);
- if (!(pw = pw_locate (argv[optind]))) {
+ pw = pw_locate (argv[optind]);
+ if (NULL == pw) {
fprintf (stderr, _("%s: unknown user %s\n"), Prog,
argv[optind]);
closelog ();
More information about the Pkg-shadow-commits
mailing list