Use unsigned printf/scanf conversion where more appropriate

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/coreutils/cal.c b/coreutils/cal.c
index 0d388aa1cbe9dbd9a4dc814e24bf43c0d430a081..12c46b14ffa6a5f359f7bcbbc789811a63fd511b 100644 (file)
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -165,7 +165,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
                char lineout[30];
 
                day_array(month, year, dp);
-               len = sprintf(lineout, "%s %d", month_names[month - 1], year);
+               len = sprintf(lineout, "%s %u", month_names[month - 1], year);
                printf("%*s%s\n%s\n",
                                ((7*julian + WEEK_LEN) - len) / 2, "",
                                lineout, day_headings);

diff --git a/coreutils/sum.c b/coreutils/sum.c
index 75f6ef60a2f6abd747ffb514fcdc2e46a4b32203..deb068e1024e7501d0db6e5e130cb2402ecf4221 100644 (file)
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -70,9 +70,9 @@ static unsigned sum_file(const char *file, unsigned type)
        if (type >= SUM_SYSV) {
                r = (s & 0xffff) + ((s & 0xffffffff) >> 16);
                s = (r & 0xffff) + (r >> 16);
-               printf("%d %llu %s\n", s, (total_bytes + 511) / 512, file);
+               printf("%u %llu %s\n", s, (total_bytes + 511) / 512, file);
        } else
-               printf("%05d %5llu %s\n", s, (total_bytes + 1023) / 1024, file);
+               printf("%05u %5llu %s\n", s, (total_bytes + 1023) / 1024, file);
        return 1;
 #undef buf
 }

diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c
index e44d9865c581868b718c48019258bdcf83e616aa..ebcb46cf273494f73d080d93494fb8b646841e56 100644 (file)
--- a/e2fsprogs/old_e2fsprogs/mke2fs.c
+++ b/e2fsprogs/old_e2fsprogs/mke2fs.c
@@ -239,7 +239,7 @@ static void test_disk(ext2_filsys fs, badblocks_list *bb_list)
        errcode_t       retval;
        char            buf[1024];
 
-       sprintf(buf, "badblocks -b %d %s%s%s %d", fs->blocksize,
+       sprintf(buf, "badblocks -b %u %s%s%s %d", fs->blocksize,
                quiet ? "" : "-s ", (cflag > 1) ? "-w " : "",
                fs->device_name, fs->super->s_blocks_count);
        mke2fs_verbose("Running command: %s\n", buf);

diff --git a/e2fsprogs/old_e2fsprogs/tune2fs.c b/e2fsprogs/old_e2fsprogs/tune2fs.c
index 3c3f4afa5b0e64c033247aaa70e67c286e903b97..bbe30e5a0c4c07247d9bece4f8a2e318407e0491 100644 (file)
--- a/e2fsprogs/old_e2fsprogs/tune2fs.c
+++ b/e2fsprogs/old_e2fsprogs/tune2fs.c
@@ -607,7 +607,7 @@ int tune2fs_main(int argc, char **argv)
        if (e_flag) {
                sb->s_errors = errors;
                ext2fs_mark_super_dirty(fs);
-               printf("Setting error behavior to %d\n", errors);
+               printf("Setting error behavior to %u\n", errors);
        }
        if (g_flag) {
                sb->s_def_resgid = resgid;

diff --git a/e2fsprogs/old_e2fsprogs/util.c b/e2fsprogs/old_e2fsprogs/util.c
index e6758e093a20d1ed1e3f4cb7b981253963f01b16..3e7ee8e757f264450379f1f7df0a31bb87f5bff1 100644 (file)
--- a/e2fsprogs/old_e2fsprogs/util.c
+++ b/e2fsprogs/old_e2fsprogs/util.c
@@ -239,7 +239,7 @@ void make_journal_blocks(ext2_filsys fs, int journal_size, int journal_flags, in
                return;
        }
        if (!quiet)
-               printf("Creating journal (%ld blocks): ", journal_blocks);
+               printf("Creating journal (%lu blocks): ", journal_blocks);
        fflush(stdout);
        retval = ext2fs_add_journal_inode(fs, journal_blocks,
                                                  journal_flags);

diff --git a/editors/patch_bbox.c b/editors/patch_bbox.c
index 78aa5fde8a34c705c7e88ff111dc956a7d19b87b..aae7b79878e575183aa37f59e1c17c1f9007721c 100644 (file)
--- a/editors/patch_bbox.c
+++ b/editors/patch_bbox.c
@@ -188,8 +188,8 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                        unsigned src_last_line = 1;
                        unsigned dst_last_line = 1;
 
-                       if ((sscanf(patch_line, "@@ -%d,%d +%d,%d", &src_beg_line, &src_last_line, &dst_beg_line, &dst_last_line) < 3)
-                        && (sscanf(patch_line, "@@ -%d +%d,%d", &src_beg_line, &dst_beg_line, &dst_last_line) < 2)
+                       if ((sscanf(patch_line, "@@ -%u,%u +%u,%u", &src_beg_line, &src_last_line, &dst_beg_line, &dst_last_line) < 3)
+                        && (sscanf(patch_line, "@@ -%u +%u,%u", &src_beg_line, &dst_beg_line, &dst_last_line) < 2)
                        ) {
                                /* No more hunks for this file */
                                break;

diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 69726ae7293636a93868ac1395bf42f2e864096e..f0e9c9d757f40f9535e200970065ea5d6a7defe8 100644 (file)
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -465,14 +465,14 @@ static void on_off(int value)
 static void print_flag_on_off(int get_arg, const char *s, unsigned long arg)
 {
        if (get_arg) {
-               printf(" setting %s to %ld", s, arg);
+               printf(" setting %s to %lu", s, arg);
                on_off(arg);
        }
 }
 
 static void print_value_on_off(const char *str, unsigned long argp)
 {
-       printf(" %s\t= %2ld", str, argp);
+       printf(" %s\t= %2lu", str, argp);
        on_off(argp != 0);
 }
 
@@ -1509,7 +1509,7 @@ static void bus_state_value(unsigned value)
        else if (value == BUSSTATE_TRISTATE)
                printf(" (tristate)\n");
        else
-               printf(" (unknown: %d)\n", value);
+               printf(" (unknown: %u)\n", value);
 }
 #endif
 
@@ -1589,7 +1589,7 @@ static void interpret_xfermode(unsigned xfermode)
 static void print_flag(int flag, const char *s, unsigned long value)
 {
        if (flag)
-               printf(" setting %s to %ld\n", s, value);
+               printf(" setting %s to %lu\n", s, value);
 }
 
 static void process_dev(char *devname)

diff --git a/networking/arp.c b/networking/arp.c
index 40d244116f073ea6167015257fa38f55d6bbd0fc..e79b1b6a1da919a1f665dec7467e466e0d5cd851 100644 (file)
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -459,12 +459,12 @@ static int arp_show(char *name)
                arp_disp(hostname, ip, type, flags, hwa, mask, dev);
        }
        if (option_mask32 & ARP_OPT_v)
-               printf("Entries: %d\tSkipped: %d\tFound: %d\n",
+               printf("Entries: %u\tSkipped: %u\tFound: %u\n",
                                entries, entries - shown, shown);
 
        if (!shown) {
                if (hw_set || host || device[0])
-                       printf("No match found in %d entries\n", entries);
+                       printf("No match found in %u entries\n", entries);
        }
        if (ENABLE_FEATURE_CLEAN_UP) {
                free((char*)host);

diff --git a/networking/netstat.c b/networking/netstat.c
index c0c6ba5010ddc567ac3be49516ab3445d9436eb1..f80b845bc98612b4e9749c0be5eccc89e494d491 100644 (file)
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -125,10 +125,10 @@ typedef enum {
  */
 #define ADDR_WIDE                51  /* INET6_ADDRSTRLEN + 5 for the port number */
 #if ENABLE_FEATURE_NETSTAT_WIDE
-# define FMT_NET_CONN_DATA       "%s   %6ld %6ld %-*s %-*s %-12s"
+# define FMT_NET_CONN_DATA       "%s   %6lu %6lu %-*s %-*s %-12s"
 # define FMT_NET_CONN_HEADER     "\nProto Recv-Q Send-Q %-*s %-*s State       %s\n"
 #else
-# define FMT_NET_CONN_DATA       "%s   %6ld %6ld %-23s %-23s %-12s"
+# define FMT_NET_CONN_DATA       "%s   %6lu %6lu %-23s %-23s %-12s"
 # define FMT_NET_CONN_HEADER     "\nProto Recv-Q Send-Q %-23s %-23s State       %s\n"
 #endif
 
@@ -403,7 +403,7 @@ static int scan_inet_proc_line(struct inet_params *param, char *line)
                        "%*d: %32[0-9A-Fa-f]:%X "
                        "%32[0-9A-Fa-f]:%X %X "
                        "%lX:%lX %*X:%*X "
-                       "%*X %d %*d %ld ",
+                       "%*X %d %*d %lu ",
                        local_addr, &param->local_port,
                        rem_addr, &param->rem_port, &param->state,
                        &param->txq, &param->rxq,
@@ -611,7 +611,7 @@ static int FAST_FUNC unix_do_one(char *line)
                strcat(ss_flags, "N ");
        strcat(ss_flags, "]");
 
-       printf("%-5s %-6ld %-11s %-10s %-13s %6lu ",
+       printf("%-5s %-6lu %-11s %-10s %-13s %6lu ",
                ss_proto, refcnt, ss_flags, ss_type, ss_state, inode
                );
 

diff --git a/networking/pscan.c b/networking/pscan.c
index 28005ad57ee2056d858c86f7b5d535563a5509b9..72ed8cdb5c36139de3253b6cca42088274a7f758 100644 (file)
--- a/networking/pscan.c
+++ b/networking/pscan.c
@@ -157,7 +157,7 @@ int pscan_main(int argc UNUSED_PARAM, char **argv)
        }
        if (ENABLE_FEATURE_CLEAN_UP) free(lsap);
 
-       printf("%d closed, %d open, %d timed out (or blocked) ports\n",
+       printf("%u closed, %u open, %u timed out (or blocked) ports\n",
                                        closed_ports,
                                        open_ports,
                                        nports - (closed_ports + open_ports));

diff --git a/procps/pgrep.c b/procps/pgrep.c
index 8daf5b28ae0b7566668c92d97f0d73340a4406a4..1c7c7c48b8ddbb62d4b626e7973026d9522f1b3f 100644 (file)
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -65,9 +65,9 @@ static void act(unsigned pid, char *cmd, int signo)
 {
        if (pgrep) {
                if (option_mask32 & (1 << OPTBIT_L)) /* OPT_LIST */
-                       printf("%d %s\n", pid, cmd);
+                       printf("%u %s\n", pid, cmd);
                else
-                       printf("%d\n", pid);
+                       printf("%u\n", pid);
        } else
                kill(pid, signo);
 }

diff --git a/procps/top.c b/procps/top.c
index 31f2a5113273e706c8189834152530688354aac1..51f1c1aedf7c21a3073061d69514685400111814 100644 (file)
--- a/procps/top.c
+++ b/procps/top.c
@@ -677,7 +677,7 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width)
                if (s->vsz >= 100000)
                        sprintf(vsz_str_buf, "%6ldm", s->vsz/1024);
                else
-                       sprintf(vsz_str_buf, "%7ld", s->vsz);
+                       sprintf(vsz_str_buf, "%7lu", s->vsz);
                /* PID PPID USER STAT VSZ %VSZ [%CPU] COMMAND */
                col = snprintf(line_buf, scr_width,
                                "\n" "%5u%6u %-8.8s %s%s" FMT

diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index 92a562919fa11d686b756fbe040d0ac300df2f26..bea73d9323955992e45ad62ca921b0fe46b692e6 100644 (file)
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -126,7 +126,7 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
                shbuf_data = shbuf->data; /* pointer! */
 
                if (DEBUG)
-                       printf("cur:%d tail:%i size:%i\n",
+                       printf("cur:%u tail:%u size:%u\n",
                                        cur, shbuf_tail, shbuf_size);
 
                if (!follow) {

diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index b3e918fb0c74ec5ebd34ebed636bd2aa9b1db65d..6f49cec8fbf73519831d044a71942ee34e67d389 100644 (file)
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -72,7 +72,7 @@ int fdformat_main(int argc UNUSED_PARAM, char **argv)
        /* original message was: "Could not determine current format type" */
        xioctl(fd, FDGETPRM, &param);
 
-       printf("%s-sided, %d tracks, %d sec/track. Total capacity %d kB\n",
+       printf("%s-sided, %u tracks, %u sec/track. Total capacity %d kB\n",
                (param.head == 2) ? "Double" : "Single",
                param.track, param.sect, param.size >> 1);
 

diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index c1d1b2cc3f40faee143e80297f468f1f6a0b1e74..33767a1afe8f8939e237e8a3f0e426a8caeea3b3 100644 (file)
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -686,7 +686,7 @@ static void get_inode_common(unsigned nr, uint16_t i_mode)
        total++;
        if (!inode_count[nr]) {
                if (!inode_in_use(nr)) {
-                       printf("Inode %d is marked as 'unused', but it is used "
+                       printf("Inode %u is marked as 'unused', but it is used "
                                        "for file '%s'\n", nr, current_name);
                        if (OPT_repair) {
                                if (ask("Mark as 'in use'", 1))

diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c
index 2668cafd4622687197728ee483633f57b51714f5..67a25a8ef285af9a3255e1b33420cca4ddb3b73f 100644 (file)
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -166,10 +166,10 @@ static NOINLINE void do_shm(void)
        case STATUS:
                printf("------ Shared Memory %s --------\n", "Status");
                printf("segments allocated %d\n"
-                               "pages allocated %ld\n"
-                               "pages resident  %ld\n"
-                               "pages swapped   %ld\n"
-                               "Swap performance: %ld attempts\t%ld successes\n",
+                               "pages allocated %lu\n"
+                               "pages resident  %lu\n"
+                               "pages swapped   %lu\n"
+                               "Swap performance: %lu attempts\t%lu successes\n",
                                shm_info.used_ids,
                                shm_info.shm_tot,
                                shm_info.shm_rss,
@@ -569,7 +569,7 @@ static void print_sem(int semid)
                if (val < 0 || ncnt < 0 || zcnt < 0 || pid < 0) {
                        bb_perror_msg_and_die("semctl");
                }
-               printf("%-10d %-10d %-10d %-10d %-10d\n", i, val, ncnt, zcnt, pid);
+               printf("%-10u %-10d %-10d %-10d %-10d\n", i, val, ncnt, zcnt, pid);
        }
        bb_putchar('\n');
 }

diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 49afd1176e984ca4723afc49647247db97e07856..d65a5161cc73ca306490142661bd72b913207cd4 100644 (file)
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -505,7 +505,7 @@ static void get_list_blocks(char *filename)
 
        listfile = xfopen_for_read(filename);
        while (!feof(listfile)) {
-               fscanf(listfile, "%ld\n", &blockno);
+               fscanf(listfile, "%lu\n", &blockno);
                mark_zone(blockno);
                G.badblocks++;
        }

diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index 974fe89c4847807eedeabdef1a94ee5d8019cdf3..a64540464307f68a0208612e34f06b24be327c56 100644 (file)
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -152,7 +152,7 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
 
        step = buf[0];
        if (optInfo) {
-               printf("Sampling_step: %i\n", step);
+               printf("Sampling_step: %u\n", step);
                return EXIT_SUCCESS;
        }
 
@@ -219,10 +219,10 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
                        && (fn_len = next_add-fn_add) != 0
                ) {
                        if (optVerbose)
-                               printf("%016llx %-40s %6i %8.4f\n", fn_add,
+                               printf("%016llx %-40s %6u %8.4f\n", fn_add,
                                        fn_name, this, this/(double)fn_len);
                        else
-                               printf("%6i %-40s %8.4f\n",
+                               printf("%6u %-40s %8.4f\n",
                                        this, fn_name, this/(double)fn_len);
                        if (optSub) {
                                unsigned long long scan;
@@ -246,14 +246,14 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
        }
 
        /* clock ticks, out of kernel text - probably modules */
-       printf("%6i %s\n", buf[len/sizeof(*buf)-1], "*unknown*");
+       printf("%6u %s\n", buf[len/sizeof(*buf)-1], "*unknown*");
 
        /* trailer */
        if (optVerbose)
-               printf("%016x %-40s %6i %8.4f\n",
+               printf("%016x %-40s %6u %8.4f\n",
                        0, "total", total, total/(double)(fn_add-add0));
        else
-               printf("%6i %-40s %8.4f\n",
+               printf("%6u %-40s %8.4f\n",
                        total, "total", total/(double)(fn_add-add0));
 
        fclose(map);