Changeset 19 in openpam

Timestamp:

02/02/02 18:04:31 (11 years ago)

Author:

des

Message:

Use 'sizeof(foo)' instead of 'sizeof foo' even where it's not
required. Although style(9) doesn't say anything about it, this
seems to be the preferred form.

Sponsored by: DARPA, NAI Labs

Location:

trunk

Files:

• bin/su/su.c (modified) (1 diff)
• lib/openpam_ttyconv.c (modified) (2 diffs)
• lib/pam_set_data.c (modified) (1 diff)
• lib/pam_start.c (modified) (2 diffs)
• lib/pam_strerror.c (modified) (1 diff)

trunk/bin/su/su.c

@@ -93 +93 @@
 
         /* set some items */
-        gethostname(hostname, sizeof hostname);
+        gethostname(hostname, sizeof(hostname));
         check("pam_set_item", pam_set_item(pamh, PAM_RHOST, hostname));
         user = getlogin();

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_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

@@ -66 +66 @@
         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)
@@ -111 +111 @@
 
         /* fill in configuration data */
-        if ((module = malloc(sizeof *module)) == NULL) {
+        if ((module = malloc(sizeof(*module))) == NULL) {
                 openpam_log(PAM_LOG_ERROR, "malloc(): %m");
                 return (PAM_BUF_ERR);

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);
         }