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

Nicolas FRANÇOIS nekral-guest at alioth.debian.org
Sun Sep 18 20:41:38 UTC 2011


Author: nekral-guest
Date: 2011-09-18 20:41:38 +0000 (Sun, 18 Sep 2011)
New Revision: 3490

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/libmisc/loginprompt.c
Log:
	* libmisc/salt.c (SHA_salt_rounds): It is statically ensured that
	the format fits in rounds_prefix.
	* libmisc/loginprompt.c: Likewise.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-09-18 20:40:50 UTC (rev 3489)
+++ upstream/trunk/ChangeLog	2011-09-18 20:41:38 UTC (rev 3490)
@@ -2,6 +2,7 @@
 
 	* libmisc/salt.c (SHA_salt_rounds): It is statically ensured that
 	the format fits in rounds_prefix.
+	* libmisc/loginprompt.c: Likewise.
 
 2011-09-18  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/libmisc/loginprompt.c
===================================================================
--- upstream/trunk/libmisc/loginprompt.c	2011-09-18 20:40:50 UTC (rev 3489)
+++ upstream/trunk/libmisc/loginprompt.c	2011-09-18 20:41:38 UTC (rev 3490)
@@ -2,7 +2,7 @@
  * Copyright (c) 1989 - 1993, Julianne Frances Haugh
  * Copyright (c) 1996 - 2000, Marek Michałkiewicz
  * Copyright (c) 2003 - 2005, Tomasz Kłoczko
- * Copyright (c) 2008 - 2010, Nicolas François
+ * Copyright (c) 2008 - 2011, Nicolas François
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -158,10 +158,9 @@
 				envp[envc] = nvar;
 			} else {
 				size_t len = strlen (nvar) + 32;
-				int wlen;
 				envp[envc] = xmalloc (len);
-				wlen = snprintf (envp[envc], len, "L%d=%s", count++, nvar);
-				assert (wlen == (int) len -1);
+				(void) snprintf (envp[envc], len,
+				                 "L%d=%s", count++, nvar);
 			}
 		}
 		set_env (envc, envp);




More information about the Pkg-shadow-commits mailing list