* src/chgpasswd.c: Add splint annotations.

	* src/chpasswd.c: Likewise.
	* src/newusers.c: Likewise.
	* libmisc/salt.c, lib/prototypes.h (crypt_make_salt): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 769242ca726a4d302fd7e71a3cb15b8bf3a0d872..b4cdb85a2f5c2f8d44ed5f5131202098193a800b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2011-08-14  Nicolas François  <nicolas.francois@centraliens.net>
 
        * libmisc/chowndir.c: Add splint annotations.
+       * src/chgpasswd.c: Likewise.
+       * src/chpasswd.c: Likewise.
+       * src/newusers.c: Likewise.
+       * libmisc/salt.c, lib/prototypes.h (crypt_make_salt): Likewise.
 
 2011-08-14  Nicolas François  <nicolas.francois@centraliens.net>
 

diff --git a/lib/prototypes.h b/lib/prototypes.h
index 86029694e5d33ca6e975f4772622b1756ee26d52..ddb815477045f2a6837ed7f5089ee862592e4b1d 100644 (file)
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -292,7 +292,7 @@ extern int do_rlogin (const char *remote_host, char *name, size_t namelen,
                       char *term, size_t termlen);
 
 /* salt.c */
-extern /*@observer@*/const char *crypt_make_salt (/*@null@*/const char *meth, /*@null@*/void *arg);
+extern /*@observer@*/const char *crypt_make_salt (/*@null@*//*@observer@*/const char *meth, /*@null@*/void *arg);
 
 /* setugid.c */
 extern int setup_groups (const struct passwd *info);

diff --git a/libmisc/salt.c b/libmisc/salt.c
index dcf39de0c7bca863cf588a8d07c23cbb56793ba3..1a3fd4b3fc0a0bc0b569723624779b1bbb08d273 100644 (file)
--- a/libmisc/salt.c
+++ b/libmisc/salt.c
@@ -202,7 +202,7 @@ static /*@observer@*/const char *gensalt (size_t salt_size)
  *  * For the SHA256 and SHA512 method, this specifies the number of rounds
  *    (if not NULL).
  */
-/*@observer@*/const char *crypt_make_salt (/*@null@*/const char *meth, /*@null@*/void *arg)
+/*@observer@*/const char *crypt_make_salt (/*@null@*//*@observer@*/const char *meth, /*@null@*/void *arg)
 {
        /* Max result size for the SHA methods:
         *  +3          $5$

diff --git a/src/chgpasswd.c b/src/chgpasswd.c
index e110fed6d1e66d5fc2b659fcbb1394c587980316..3ba79b5080c4f9b8a38f3b82fe3f2d2a227e1a38 100644 (file)
--- a/src/chgpasswd.c
+++ b/src/chgpasswd.c
@@ -65,7 +65,7 @@ static bool md5flg = false;
 static bool sflg   = false;
 #endif
 
-static const char *crypt_method = NULL;
+static /*@null@*//*@observer@*/const char *crypt_method = NULL;
 #ifdef USE_SHA_CRYPT
 static long sha_rounds = 5000;
 #endif

diff --git a/src/chpasswd.c b/src/chpasswd.c
index 4dc583c7e246e501aa9f42d0829f2932b2ed812e..eb3bd873fcf7b8643080aa470596ca8938e88ae2 100644 (file)
--- a/src/chpasswd.c
+++ b/src/chpasswd.c
@@ -62,7 +62,7 @@ static bool md5flg = false;
 static bool sflg   = false;
 #endif                         /* USE_SHA_CRYPT */
 
-static const char *crypt_method = NULL;
+static /*@null@*//*@observer@*/const char *crypt_method = NULL;
 #ifdef USE_SHA_CRYPT
 static long sha_rounds = 5000;
 #endif                         /* USE_SHA_CRYPT */

diff --git a/src/newusers.c b/src/newusers.c
index 92459de70156b001792b6459d3084e74f10c3124..a88d9b77162eee442aae02b71c78af1bce40fbc7 100644 (file)
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -75,7 +75,7 @@ const char *Prog;
 static bool rflg = false;      /* create a system account */
 #ifndef USE_PAM
 static bool cflg = false;
-static char *crypt_method = NULL;
+static /*@null@*//*@observer@*/char *crypt_method = NULL;
 #ifdef USE_SHA_CRYPT
 static bool sflg = false;
 static long sha_rounds = 5000;