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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-24 23:04:27 +0000 (Fri, 24 Apr 2009)
New Revision: 2791

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/libmisc/obscure.c
Log:
	* libmisc/obscure.c: Change some int to size_t.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-24 23:03:14 UTC (rev 2790)
+++ upstream/trunk/ChangeLog	2009-04-24 23:04:27 UTC (rev 2791)
@@ -1,5 +1,9 @@
 2009-04-25  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* libmisc/obscure.c: Change some int to size_t.
+
+2009-04-25  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/console.c: Use a less disturbing construct for splint.
 
 2009-04-25  Nicolas François  <nicolas.francois at centraliens.net>

Modified: upstream/trunk/libmisc/obscure.c
===================================================================
--- upstream/trunk/libmisc/obscure.c	2009-04-24 23:03:14 UTC (rev 2790)
+++ upstream/trunk/libmisc/obscure.c	2009-04-24 23:04:27 UTC (rev 2791)
@@ -52,7 +52,7 @@
  */
 static bool palindrome (unused const char *old, const char *new)
 {
-	int i, j;
+	size_t i, j;
 
 	i = strlen (new);
 
@@ -223,7 +223,7 @@
 static const char *obscure_msg (const char *old, const char *new,
 				    const struct passwd *pwdp)
 {
-	int maxlen, oldlen, newlen;
+	size_t maxlen, oldlen, newlen;
 	char *new1, *old1;
 	const char *msg;
 	char *result;
@@ -231,7 +231,7 @@
 	oldlen = strlen (old);
 	newlen = strlen (new);
 
-	if (newlen < getdef_num ("PASS_MIN_LEN", 0)) {
+	if (newlen < (size_t) getdef_num ("PASS_MIN_LEN", 0)) {
 		return _("too short");
 	}
 
@@ -271,7 +271,7 @@
 		}
 
 	}
-	maxlen = getdef_num ("PASS_MAX_LEN", 8);
+	maxlen = (size_t) getdef_num ("PASS_MAX_LEN", 8);
 	if (   (oldlen <= maxlen)
 	    && (newlen <= maxlen)) {
 		return NULL;