From a9c38f49020d85b0fd85683b3782e22f6d40a8b9 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 14 Aug 2011 14:37:17 +0000 Subject: [PATCH] * src/chgpasswd.c: Add splint annotations. * src/chpasswd.c: Likewise. * src/newusers.c: Likewise. * libmisc/salt.c, lib/prototypes.h (crypt_make_salt): Likewise. --- ChangeLog | 4 ++++ lib/prototypes.h | 2 +- libmisc/salt.c | 2 +- src/chgpasswd.c | 2 +- src/chpasswd.c | 2 +- src/newusers.c | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 769242ca..b4cdb85a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2011-08-14 Nicolas François * 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 diff --git a/lib/prototypes.h b/lib/prototypes.h index 86029694..ddb81547 100644 --- 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 dcf39de0..1a3fd4b3 100644 --- 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 e110fed6..3ba79b50 100644 --- 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 4dc583c7..eb3bd873 100644 --- 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 92459de7..a88d9b77 100644 --- 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;