Remove useless cast in printf and printf-like functions:

use %u for uid_t and gid_t

diff --git a/pw/pw_conf.c b/pw/pw_conf.c
index 06117e27b740febba60cc039fb154eb75bb5da54..24c06508aba4537bd1be1b517d762c24a821687a 100644 (file)
--- a/pw/pw_conf.c
+++ b/pw/pw_conf.c
@@ -453,19 +453,19 @@ write_userconfig(char const * file)
                            config.default_class : "");
                        break;
                case _UC_MINUID:
-                       sbuf_printf(buf, "%lu", (unsigned long) config.min_uid);
+                       sbuf_printf(buf, "%u", config.min_uid);
                        quote = 0;
                        break;
                case _UC_MAXUID:
-                       sbuf_printf(buf, "%lu", (unsigned long) config.max_uid);
+                       sbuf_printf(buf, "%u", config.max_uid);
                        quote = 0;
                        break;
                case _UC_MINGID:
-                       sbuf_printf(buf, "%lu", (unsigned long) config.min_gid);
+                       sbuf_printf(buf, "%u", config.min_gid);
                        quote = 0;
                        break;
                case _UC_MAXGID:
-                       sbuf_printf(buf, "%lu", (unsigned long) config.max_gid);
+                       sbuf_printf(buf, "%u", config.max_gid);
                        quote = 0;
                        break;
                case _UC_EXPIRE:

diff --git a/pw/pw_group.c b/pw/pw_group.c
index 53757f55e5e7f9935e1580367ac978979c871996..37f2426f5a80e6475f16f9d53549ef17a60502c3 100644 (file)
--- a/pw/pw_group.c
+++ b/pw/pw_group.c
@@ -83,7 +83,7 @@ pw_group(struct userconf * cnf, int mode, struct cargs * args)
                gid_t next = gr_gidpolicy(cnf, args);
                if (getarg(args, 'q'))
                        return next;
-               printf("%ld\n", (long)next);
+               printf("%u\n", next);
                return EXIT_SUCCESS;
        }
 
@@ -137,7 +137,7 @@ pw_group(struct userconf * cnf, int mode, struct cargs * args)
                        else if (rc != 0) {
                                err(EX_IOERR, "group update");
                        }
-                       pw_log(cnf, mode, W_GROUP, "%s(%ld) removed", a_name->val, (long) gid);
+                       pw_log(cnf, mode, W_GROUP, "%s(%u) removed", a_name->val, gid);
                        return EXIT_SUCCESS;
                } else if (mode == M_PRINT)
                        return print_group(grp, getarg(args, 'P') != NULL);
@@ -279,7 +279,7 @@ pw_group(struct userconf * cnf, int mode, struct cargs * args)
        if ((grp = GETGRNAM(arg->val)) == NULL)
                errx(EX_SOFTWARE, "group disappeared during update");
 
-       pw_log(cnf, mode, W_GROUP, "%s(%ld)", grp->gr_name, (long) grp->gr_gid);
+       pw_log(cnf, mode, W_GROUP, "%s(%u)", grp->gr_name, grp->gr_gid);
 
        free(members);
 
@@ -361,7 +361,7 @@ gr_gidpolicy(struct userconf * cnf, struct cargs * args)
                gid = (gid_t) atol(a_gid->val);
 
                if ((grp = GETGRGID(gid)) != NULL && getarg(args, 'o') == NULL)
-                       errx(EX_DATAERR, "gid `%ld' has already been allocated", (long) grp->gr_gid);
+                       errx(EX_DATAERR, "gid `%u' has already been allocated", grp->gr_gid);
        } else {
                struct bitmap   bm;
 

diff --git a/pw/pw_user.c b/pw/pw_user.c
index 112d0183a5e1cc9c61b4680060f095f3a5f96ec0..48eb934d76247d78ae70a286522cd2e5a0cdb52f 100644 (file)
--- a/pw/pw_user.c
+++ b/pw/pw_user.c
@@ -139,7 +139,7 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
                uid_t next = pw_uidpolicy(cnf, args);
                if (getarg(args, 'q'))
                        return next;
-               printf("%ld:", (long)next);
+               printf("%u:", next);
                pw_group(cnf, mode, args);
                return EXIT_SUCCESS;
        }
@@ -449,7 +449,7 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
                        }
                        ENDGRENT();
 
-                       pw_log(cnf, mode, W_USER, "%s(%ld) account removed", a_name->val, (long) uid);
+                       pw_log(cnf, mode, W_USER, "%s(%u) account removed", a_name->val, uid);
 
                        if (!PWALTDIR()) {
                                /*
@@ -469,8 +469,8 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
                                if (getarg(args, 'r') != NULL && *home == '/' && getpwuid(uid) == NULL) {
                                        if (stat(home, &st) != -1) {
                                                rm_r(home, uid);
-                                               pw_log(cnf, mode, W_USER, "%s(%ld) home '%s' %sremoved",
-                                                      a_name->val, (long) uid, home,
+                                               pw_log(cnf, mode, W_USER, "%s(%u) home '%s' %sremoved",
+                                                      a_name->val, uid, home,
                                                       stat(home, &st) == -1 ? "" : "not completely ");
                                        }
                                }
@@ -789,9 +789,9 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
                errx(EX_NOUSER, "user '%s' disappeared during update", a_name->val);
 
        grp = GETGRGID(pwd->pw_gid);
-       pw_log(cnf, mode, W_USER, "%s(%ld):%s(%ld):%s:%s:%s",
-              pwd->pw_name, (long) pwd->pw_uid,
-           grp ? grp->gr_name : "unknown", (long) (grp ? grp->gr_gid : (uid_t)-1),
+       pw_log(cnf, mode, W_USER, "%s(%u):%s(%u):%s:%s:%s",
+              pwd->pw_name, pwd->pw_uid,
+           grp ? grp->gr_name : "unknown", (grp ? grp->gr_gid : (uid_t)-1),
               pwd->pw_gecos, pwd->pw_dir, pwd->pw_shell);
 
        /*
@@ -815,8 +815,8 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
         */
        if (!PWALTDIR() && getarg(args, 'm') != NULL && pwd->pw_dir && *pwd->pw_dir == '/' && pwd->pw_dir[1]) {
                copymkdir(pwd->pw_dir, cnf->dotdir, cnf->homemode, pwd->pw_uid, pwd->pw_gid);
-               pw_log(cnf, mode, W_USER, "%s(%ld) home %s made",
-                      pwd->pw_name, (long) pwd->pw_uid, pwd->pw_dir);
+               pw_log(cnf, mode, W_USER, "%s(%u) home %s made",
+                      pwd->pw_name, pwd->pw_uid, pwd->pw_dir);
        }
 
 
@@ -835,8 +835,8 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
                                fputs(line, pfp);
                        }
                        pclose(pfp);
-                       pw_log(cnf, mode, W_USER, "%s(%ld) new user mail sent",
-                           pwd->pw_name, (long) pwd->pw_uid);
+                       pw_log(cnf, mode, W_USER, "%s(%u) new user mail sent",
+                           pwd->pw_name, pwd->pw_uid);
                }
                fclose(fp);
        }
@@ -859,7 +859,7 @@ pw_uidpolicy(struct userconf * cnf, struct cargs * args)
                uid = (uid_t) atol(a_uid->val);
 
                if ((pwd = GETPWUID(uid)) != NULL && getarg(args, 'o') == NULL)
-                       errx(EX_DATAERR, "uid `%ld' has already been allocated", (long) pwd->pw_uid);
+                       errx(EX_DATAERR, "uid `%u' has already been allocated", pwd->pw_uid);
        } else {
                struct bitmap   bm;
 
@@ -1183,14 +1183,14 @@ print_user(struct passwd * pwd, int pretty, int v7)
                        strftime(acexpire, sizeof acexpire, "%c", tptr);
                if (pwd->pw_change > (time_t)0 && (tptr = localtime(&pwd->pw_change)) != NULL)
                        strftime(pwexpire, sizeof pwexpire, "%c", tptr);
-               printf("Login Name: %-15s   #%-12ld Group: %-15s   #%ld\n"
+               printf("Login Name: %-15s   #%-12u Group: %-15s   #%u\n"
                       " Full Name: %s\n"
                       "      Home: %-26.26s      Class: %s\n"
                       "     Shell: %-26.26s     Office: %s\n"
                       "Work Phone: %-26.26s Home Phone: %s\n"
                       "Acc Expire: %-26.26s Pwd Expire: %s\n",
-                      pwd->pw_name, (long) pwd->pw_uid,
-                      grp ? grp->gr_name : "(invalid)", (long) pwd->pw_gid,
+                      pwd->pw_name, pwd->pw_uid,
+                      grp ? grp->gr_name : "(invalid)", pwd->pw_gid,
                       uname, pwd->pw_dir, pwd->pw_class,
                       pwd->pw_shell, office, wphone, hphone,
                       acexpire, pwexpire);