* src/login.c: Added splint annotations.

diff --git a/ChangeLog b/ChangeLog
index 3caff5ce86926eb57168a250ba0bb39fa35ce123..9cde1a664983e5ac82140b41ee32ea6639e798fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * src/login.c: Added assert()s for NULL (or ! NULL) username, and
        pwd. This helps splint.
+       * src/login.c: Added splint annotations.
 
 2009-04-22  Nicolas François  <nicolas.francois@centraliens.net>
 

diff --git a/src/login.c b/src/login.c
index 77abe109607b1405643b486c03e090532ba99a30..88009b7dabf65cf6f593f74b3d21eae891145068 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -83,7 +83,7 @@ static pam_handle_t *pamh = NULL;
 char *Prog;
 
 static const char *hostname = "";
-static char *username = NULL;
+static /*@null@*/ /*@only@*/char *username = NULL;
 static int reason = PW_LOGIN;
 
 #ifndef USE_PAM
@@ -122,8 +122,8 @@ extern char **environ;
 /* local function prototypes */
 static void usage (void);
 static void setup_tty (void);
-static void process_flags (int, char *const *);
-static const char *get_failent_user (const char *user);
+static void process_flags (int argc, char *const *argv);
+static const char *get_failent_user (/*@returned@*/const char *user);
 static void update_utmp (const char *username,
                          const char *tty,
                          const char *hostname,
@@ -454,7 +454,7 @@ static void get_pam_user (char **ptr_pam_user)
  * It is quite common to mistyped the password for username, and passwords
  * should not be logged.
  */
-static const char *get_failent_user (const char *user)
+static const char *get_failent_user (/*@returned@*/const char *user)
 {
        const char *failent_user = "UNKNOWN";
        bool log_unkfail_enab = getdef_bool("LOG_UNKFAIL_ENAB");
@@ -537,7 +537,7 @@ int main (int argc, char **argv)
        struct passwd *pwd = NULL;
        char **envp = environ;
        const char *failent_user;
-       struct utmp *utent;
+       /*@null@*/struct utmp *utent;
 
 #ifdef USE_PAM
        int retcode;