Fix miscellanious size_t related compiler warnings.

diff --git a/contrib/ipfilter/ipft_ef.c b/contrib/ipfilter/ipft_ef.c
index c8ae3f2..f129478 100644 (file)
--- a/contrib/ipfilter/ipft_ef.c
+++ b/contrib/ipfilter/ipft_ef.c
@@ -146,7 +146,7 @@ int cnt, *dir;
        (void) inet_aton(src, &ip->ip_src);
        (void) inet_aton(dst, &ip->ip_dst);
        ip->ip_len = atoi(len);
-       ip->ip_hl = sizeof(ip_t);
+       ip->ip_hl = (unsigned)sizeof(ip_t);
 
        slen = ip->ip_hl + extra;
        i = MIN(cnt, slen);

diff --git a/contrib/ipfilter/ipft_td.c b/contrib/ipfilter/ipft_td.c
index 99beab5..3575196 100644 (file)
--- a/contrib/ipfilter/ipft_td.c
+++ b/contrib/ipfilter/ipft_td.c
@@ -160,7 +160,7 @@ int cnt, *dir;
                (void) inet_aton(src, &ip->ip_src);
                (void) inet_aton(src, &ip->ip_dst);
        }
-       ip->ip_len = ip->ip_hl = sizeof(ip_t);
+       ip->ip_len = ip->ip_hl = (unsigned)sizeof(ip_t);
 
        s = strtok(misc, " :");
        if ((p = getprotobyname(s))) {

diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index a958d36..d2ba781 100644 (file)
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -397,8 +397,8 @@ readhdrinfo(pid_t pid, prstatus_t *status, prfpregset_t *fpregset,
        if ((n = read(fd, &status->pr_reg, sizeof status->pr_reg)) == -1)
                err(1, "read error from %s", name);
        if (n < sizeof status->pr_reg)
-               errx(1, "short read from %s: wanted %u, got %d", name,
-                   sizeof status->pr_reg, n);
+               errx(1, "short read from %s: wanted %zu, got %d",
+                    name, sizeof(status->pr_reg), n);
        close(fd);
 
        /* Read the floating point registers. */
@@ -408,8 +408,8 @@ readhdrinfo(pid_t pid, prstatus_t *status, prfpregset_t *fpregset,
        if ((n = read(fd, fpregset, sizeof *fpregset)) == -1)
                err(1, "read error from %s", name);
        if (n < sizeof *fpregset)
-               errx(1, "short read from %s: wanted %u, got %d", name,
-                   sizeof *fpregset, n);
+               errx(1, "short read from %s: wanted %zu, got %d",
+                    name, sizeof(*fpregset), n);
        close(fd);
 
        /* Read and parse the process status. */
@@ -485,7 +485,7 @@ readmap(pid_t pid)
                int len;
 
                len = 0;
-               n = sscanf(mapbuf + pos, "%x %x %*d %*d %*x %3[-rwx]"
+               n = sscanf(mapbuf + pos, "%p %p %*d %*d %*x %3[-rwx]"
                    " %*d %*d %*x %*s %*s %16s%*[\n]%n",
                    &start, &end, prot, type, &len);
                if (n != 4)

diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 41da4df..88ac75a 100644 (file)
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -767,7 +767,7 @@ dointr(void)
                        infop = intrname[i];
                        if (verbose && named) {
                                snprintf(irqinfo, sizeof(irqinfo),
-                                        "irq%d: %s", i, intrname[i]);
+                                        "irq%zd: %s", i, intrname[i]);
                                infop = irqinfo;
                        }
                        printf("%-*.*s %11lu %10lu\n", 

diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index f3eb747..299852f 100644 (file)
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -174,7 +174,8 @@ usage(void)
 int
 openfiles(char *system, char *kmemf, struct kvmvars *kvp)
 {
-       int mib[3], state, size, openmode;
+       int mib[3], state, openmode;
+       size_t size;
        char errbuf[_POSIX2_LINE_MAX];
 
        if (!kflag) {
@@ -241,7 +242,8 @@ kern_readonly(int mode)
 int
 getprof(struct kvmvars *kvp)
 {
-       int mib[3], size;
+       int mib[3];
+       size_t size;
 
        if (kflag) {
                size = kvm_read(kvp->kd, nl[N_GMONPARAM].n_value, &kvp->gpm,
@@ -267,26 +269,28 @@ void
 setprof(struct kvmvars *kvp, int state)
 {
        struct gmonparam *p = (struct gmonparam *)nl[N_GMONPARAM].n_value;
-       int mib[3], sz, oldstate;
+       int mib[3], oldstate;
+       size_t size;
 
-       sz = sizeof(state);
+       size = sizeof(state);
        if (!kflag) {
                mib[0] = CTL_KERN;
                mib[1] = KERN_PROF;
                mib[2] = GPROF_STATE;
-               if (sysctl(mib, 3, &oldstate, &sz, NULL, 0) < 0)
+               if (sysctl(mib, 3, &oldstate, &size, NULL, 0) < 0)
                        goto bad;
                if (oldstate == state)
                        return;
                seteuid(0);
-               if (sysctl(mib, 3, NULL, NULL, &state, sz) >= 0) {
+               if (sysctl(mib, 3, NULL, NULL, &state, size) >= 0) {
                        seteuid(getuid());
                        return;
                }
                seteuid(getuid());
-       } else if (kvm_write(kvp->kd, (u_long)&p->state, (void *)&state, sz)
-           == sz)
+       } else if (kvm_write(kvp->kd, (u_long)&p->state, (void *)&state, size)
+                   == size) {
                return;
+       }
 bad:
        warnx("warning: cannot turn profiling %s",
            state == GMON_PROF_OFF ? "off" : "on");
@@ -303,7 +307,8 @@ dumpstate(struct kvmvars *kvp)
        struct tostruct *tos;
        u_long frompc;
        u_short *froms, *tickbuf;
-       int mib[3], i;
+       int mib[3];
+       size_t i;
        struct gmonhdr h;
        int fromindex, endfrom, toindex;
 

diff --git a/usr.sbin/memcontrol/memcontrol.c b/usr.sbin/memcontrol/memcontrol.c
index 7c76548..fb03a4a 100644 (file)
--- a/usr.sbin/memcontrol/memcontrol.c
+++ b/usr.sbin/memcontrol/memcontrol.c
@@ -136,7 +136,7 @@ mrgetall(int memfd, int *nmr)
     *nmr = mro.mo_arg[0];
     mrd = malloc(*nmr * sizeof(struct mem_range_desc));
     if (mrd == NULL)
-       errx(1, "can't allocate %d bytes for %d range descriptors", 
+       errx(1, "can't allocate %zu bytes for %d range descriptors",
             *nmr * sizeof(struct mem_range_desc), *nmr);
 
     mro.mo_arg[0] = *nmr;

diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c
index e0698d4..bc86b1a 100644 (file)
--- a/usr.sbin/timed/timed/readmsg.c
+++ b/usr.sbin/timed/timed/readmsg.c
@@ -211,7 +211,7 @@ again:
                 */
                if (n < (ssize_t)(sizeof(struct tsp) - MAXHOSTNAMELEN + 32)) {
                        syslog(LOG_NOTICE,
-                           "short packet (%u/%u bytes) from %s",
+                           "short packet (%zd/%zu bytes) from %s",
                              n, sizeof(struct tsp) - MAXHOSTNAMELEN + 32,
                              inet_ntoa(from.sin_addr));
                        continue;

diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c
index 44aa6bc..947dea4 100644 (file)
--- a/usr.sbin/timed/timedc/cmds.c
+++ b/usr.sbin/timed/timedc/cmds.c
@@ -327,7 +327,7 @@ msite(int argc, char *argv[])
                         */
                        if (cc < (sizeof(struct tsp) - MAXHOSTNAMELEN + 32)) {
                                fprintf(stderr, 
-                                  "short packet (%u/%u bytes) from %s\n",
+                                  "short packet (%d/%zu bytes) from %s\n",
                                   cc, sizeof(struct tsp) - MAXHOSTNAMELEN + 32,
                                   inet_ntoa(from.sin_addr));
                                continue;
@@ -480,7 +480,7 @@ tracing(int argc, char *argv[])
                 * least long enough to hold a 4.3BSD packet.
                 */
                if (cc < (sizeof(struct tsp) - MAXHOSTNAMELEN + 32)) {
-                       fprintf(stderr, "short packet (%u/%u bytes) from %s\n",
+                       fprintf(stderr, "short packet (%d/%zu bytes) from %s\n",
                            cc, sizeof(struct tsp) - MAXHOSTNAMELEN + 32,
                            inet_ntoa(from.sin_addr));
                        return;