Changeset 35 in openpam

Timestamp:

Feb 6, 2002, 1:25:36 PM (19 years ago)

Author:

Dag-Erling Smørgrav

Message:

According to bde, it's OK to omit parentheses when taking the size
of an object rather than a type.

Sponsored by: DARPA, NAI Labs

Location:

trunk/lib

Files:

• openpam_load.c (modified) (1 diff)
• openpam_ttyconv.c (modified) (2 diffs)
• pam_get_user.c (modified) (2 diffs)
• pam_set_data.c (modified) (1 diff)
• pam_start.c (modified) (1 diff)
• pam_strerror.c (modified) (1 diff)

trunk/lib/openpam_load.c

@@ -185 +185 @@
         pam_chain_t *new, *iterator;
 
-        if ((new = calloc(1, sizeof(*new))) == NULL)
+        if ((new = calloc(1, sizeof *new)) == NULL)
                 goto buf_err;
         if ((new->optv = malloc(sizeof(char *) * (optc + 1))) == NULL)

trunk/lib/openpam_ttyconv.c

@@ -65 +65 @@
         if (n <= 0 || n > PAM_MAX_NUM_MSG)
                 return (PAM_CONV_ERR);
-        if ((*resp = calloc(n, sizeof(**resp))) == NULL)
+        if ((*resp = calloc(n, sizeof **resp)) == NULL)
                 return (PAM_BUF_ERR);
         fd = fileno(stdin);
@@ -92 +92 @@
                         fputs(msg[i]->msg, stderr);
                         buf[0] = '\0';
-                        fgets(buf, sizeof(buf), stdin);
+                        fgets(buf, sizeof buf, stdin);
                         if (msg[i]->msg_style == PAM_PROMPT_ECHO_OFF) {
                                 tattr.c_lflag = lflag;

trunk/lib/pam_get_user.c

@@ -50 +50 @@
 int
 pam_get_user(pam_handle_t *pamh,
-        char **user,
+        const char **user,
         const char *prompt)
 {
-        char *p;
+        char *p, *resp;
         int r;
 
@@ -59 +59 @@
                 return (PAM_SYSTEM_ERR);
 
-        r = pam_get_item(pamh, PAM_USER, (void **)user);
+        r = pam_get_item(pamh, PAM_USER, (const void **)user);
         if (r == PAM_SUCCESS)
                 return (PAM_SUCCESS);
         if (prompt == NULL) {
-                if (pam_get_item(pamh, PAM_USER_PROMPT, (void **)&p) !=
-                    PAM_SUCCESS || p == NULL)
+                if (pam_get_item(pamh, PAM_USER_PROMPT,
+                    (const void **)&p) != PAM_SUCCESS || p == NULL)
                         prompt = "Login: ";
         }
-        r = pam_prompt(pamh, user, 0, "%s", prompt ? prompt : p);
+        r = pam_prompt(pamh, &resp, 0, "%s", prompt ? prompt : p);
         if (r != PAM_SUCCESS)
                 return (r);
+        *user = resp;
         return (pam_set_item(pamh, PAM_USER, *user));
 }

trunk/lib/pam_set_data.c

@@ -72 +72 @@
         }
 
-        if ((dp = malloc(sizeof(*dp))) == NULL)
+        if ((dp = malloc(sizeof *dp)) == NULL)
                 return (PAM_BUF_ERR);
         if ((dp->name = strdup(module_data_name)) == NULL) {

trunk/lib/pam_start.c

@@ -63 +63 @@
         int r;
 
-        if ((ph = calloc(1, sizeof(*ph))) == NULL)
+        if ((ph = calloc(1, sizeof *ph)) == NULL)
                 return (PAM_BUF_ERR);
         if ((r = pam_set_item(ph, PAM_SERVICE, service)) != PAM_SUCCESS)

trunk/lib/pam_strerror.c

@@ -118 +118 @@
                 return ("unknown authentication domain");
         default:
-                snprintf(unknown, sizeof(unknown), "#%d", error_number);
+                snprintf(unknown, sizeof unknown, "#%d", error_number);
                 return (unknown);
         }