Module Name: src
Committed By: lukem
Date: Mon Apr 13 00:27:38 UTC 2009
Modified Files:
src/usr.bin/pmap: main.c pmap.c pmap.h
Log Message:
Fix WARNS=4 issues (-Wcast-qual -Wextra -Wsign-compare)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/pmap/main.c
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/pmap/pmap.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/pmap/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/pmap/main.c
diff -u src/usr.bin/pmap/main.c:1.19 src/usr.bin/pmap/main.c:1.20
--- src/usr.bin/pmap/main.c:1.19 Tue Jun 17 15:54:45 2008
+++ src/usr.bin/pmap/main.c Mon Apr 13 00:27:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.19 2008/06/17 15:54:45 christos Exp $ */
+/* $NetBSD: main.c,v 1.20 2009/04/13 00:27:38 lukem Exp $ */
/*
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.19 2008/06/17 15:54:45 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.20 2009/04/13 00:27:38 lukem Exp $");
#endif
#include <sys/param.h>
@@ -62,45 +62,45 @@
rlim_t maxssiz;
struct nlist ksyms[] = {
- { "_maxsmap" },
+ { "_maxsmap", 0, 0, 0, 0 },
#define NL_MAXSSIZ 0
- { "_uvm_vnodeops" },
+ { "_uvm_vnodeops", 0, 0, 0, 0 },
#define NL_UVM_VNODEOPS 1
- { "_uvm_deviceops" },
+ { "_uvm_deviceops", 0, 0, 0, 0 },
#define NL_UVM_DEVICEOPS 2
- { "_aobj_pager" },
+ { "_aobj_pager", 0, 0, 0, 0 },
#define NL_AOBJ_PAGER 3
- { "_ubc_pager" },
+ { "_ubc_pager", 0, 0, 0, 0 },
#define NL_UBC_PAGER 4
- { "_kernel_map" },
+ { "_kernel_map", 0, 0, 0, 0 },
#define NL_KERNEL_MAP 5
- { "_nchashtbl" },
+ { "_nchashtbl", 0, 0, 0, 0 },
#define NL_NCHASHTBL 6
- { "_nchash" },
+ { "_nchash", 0, 0, 0, 0 },
#define NL_NCHASH 7
- { NULL }
+ { NULL, 0, 0, 0, 0 }
};
struct nlist kmaps[] = {
- { "_kmem_map" },
+ { "_kmem_map", 0, 0, 0, 0 },
#define NL_kmem_map 0
- { "_mb_map" },
+ { "_mb_map", 0, 0, 0, 0 },
#define NL_mb_map 1
- { "_phys_map" },
+ { "_phys_map", 0, 0, 0, 0 },
#define NL_phys_map 2
- { "_exec_map" },
+ { "_exec_map", 0, 0, 0, 0 },
#define NL_exec_map 3
- { "_pager_map" },
+ { "_pager_map", 0, 0, 0, 0 },
#define NL_pager_map 4
- { "_st_map" },
+ { "_st_map", 0, 0, 0, 0 },
#define NL_st_map 5
- { "_pt_map" },
+ { "_pt_map", 0, 0, 0, 0 },
#define NL_pt_map 6
- { "_lkm_map" },
+ { "_lkm_map", 0, 0, 0, 0 },
#define NL_lkm_map 7
- { "_buf_map" },
+ { "_buf_map", 0, 0, 0, 0 },
#define NL_buf_map 8
- { NULL }
+ { NULL, 0, 0, 0, 0 },
};
#define VMSPACE_ADDRESS 1
@@ -110,7 +110,7 @@
void check_fd(int);
void load_symbols(kvm_t *);
-void cache_enter(int, struct namecache *);
+void cache_enter(u_long, struct namecache *);
int
main(int argc, char *argv[])
@@ -450,8 +450,7 @@
{
struct namecache _ncp, *ncp, *oncp;
struct nchashhead _ncpp, *ncpp;
- u_long nchash;
- int i;
+ u_long nchash, i;
LIST_INIT(&lcache);
@@ -484,12 +483,12 @@
}
void
-cache_enter(int i, struct namecache *ncp)
+cache_enter(u_long i, struct namecache *ncp)
{
struct cache_entry *ce;
if (debug & DUMP_NAMEI_CACHE)
- printf("[%d] ncp->nc_vp %10p, ncp->nc_dvp %10p, "
+ printf("[%lu] ncp->nc_vp %10p, ncp->nc_dvp %10p, "
"ncp->nc_nlen %3d [%.*s]\n",
i, ncp->nc_vp, ncp->nc_dvp,
ncp->nc_nlen, ncp->nc_nlen, ncp->nc_name);
@@ -500,7 +499,7 @@
ce->ce_pvp = ncp->nc_dvp;
ce->ce_nlen = ncp->nc_nlen;
strncpy(ce->ce_name, ncp->nc_name, sizeof(ce->ce_name));
- ce->ce_name[MIN(ce->ce_nlen, sizeof(ce->ce_name) - 1)] = '\0';
+ ce->ce_name[MIN(ce->ce_nlen, (int)(sizeof(ce->ce_name) - 1))] = '\0';
LIST_INSERT_HEAD(&lcache, ce, ce_next);
}
Index: src/usr.bin/pmap/pmap.c
diff -u src/usr.bin/pmap/pmap.c:1.42 src/usr.bin/pmap/pmap.c:1.43
--- src/usr.bin/pmap/pmap.c:1.42 Mon Dec 29 01:40:59 2008
+++ src/usr.bin/pmap/pmap.c Mon Apr 13 00:27:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.42 2008/12/29 01:40:59 christos Exp $ */
+/* $NetBSD: pmap.c,v 1.43 2009/04/13 00:27:38 lukem Exp $ */
/*
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: pmap.c,v 1.42 2008/12/29 01:40:59 christos Exp $");
+__RCSID("$NetBSD: pmap.c,v 1.43 2009/04/13 00:27:38 lukem Exp $");
#endif
#include <string.h>
@@ -533,7 +533,8 @@
int *am_slots;
int *am_bckptr;
int *am_ppref;
- size_t i, r, l, e;
+ size_t l;
+ int i, r, e;
if (S(amap) == (size_t)-1) {
heapfound = 1;
@@ -630,7 +631,7 @@
l--;
}
- dump_vm_anon(kd, am_anon, (int)i);
+ dump_vm_anon(kd, am_anon, i);
}
free(am_anon);
@@ -720,12 +721,18 @@
(unsigned long long)minor(dev));
name = buf;
}
- else if (UVM_OBJ_IS_AOBJ(D(uvm_obj, uvm_object)))
- name = " [ uvm_aobj ]";
- else if (UVM_OBJ_IS_UBCPAGER(D(uvm_obj, uvm_object)))
- name = " [ ubc_pager ]";
- else if (UVM_OBJ_IS_VNODE(D(uvm_obj, uvm_object)))
- name = " [ ?VNODE? ]";
+ else if (UVM_OBJ_IS_AOBJ(D(uvm_obj, uvm_object))) {
+ snprintf(buf, sizeof(buf), " [ uvm_aobj ]");
+ name = buf;
+ }
+ else if (UVM_OBJ_IS_UBCPAGER(D(uvm_obj, uvm_object))) {
+ snprintf(buf, sizeof(buf), " [ ubc_pager ]");
+ name = buf;
+ }
+ else if (UVM_OBJ_IS_VNODE(D(uvm_obj, uvm_object))) {
+ snprintf(buf, sizeof(buf), " [ ?VNODE? ]");
+ name = buf;
+ }
else {
snprintf(buf, sizeof(buf), " [ ?? %p ?? ]",
D(uvm_obj, uvm_object)->pgops);
@@ -736,14 +743,17 @@
else if ((char *)D(vmspace, vmspace)->vm_maxsaddr <=
(char *)vme->start &&
((char *)D(vmspace, vmspace)->vm_maxsaddr + (size_t)maxssiz) >=
- (char *)vme->end)
- name = " [ stack ]";
+ (char *)vme->end) {
+ snprintf(buf, sizeof(buf), " [ stack ]");
+ name = buf;
+ }
else if (!heapfound &&
(vme->protection & rwx) == rwx &&
vme->start >= (u_long)D(vmspace, vmspace)->vm_daddr) {
heapfound = 1;
- name = " [ heap ]";
+ snprintf(buf, sizeof(buf), " [ heap ]");
+ name = buf;
}
else if (UVM_ET_ISSUBMAP(vme)) {
@@ -752,8 +762,10 @@
name = buf;
}
- else
- name = " [ anon ]";
+ else {
+ snprintf(buf, sizeof(buf), " [ anon ]");
+ name = buf;
+ }
return (name);
}
Index: src/usr.bin/pmap/pmap.h
diff -u src/usr.bin/pmap/pmap.h:1.7 src/usr.bin/pmap/pmap.h:1.8
--- src/usr.bin/pmap/pmap.h:1.7 Mon Apr 28 20:24:14 2008
+++ src/usr.bin/pmap/pmap.h Mon Apr 13 00:27:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.7 2008/04/28 20:24:14 martin Exp $ */
+/* $NetBSD: pmap.h,v 1.8 2009/04/13 00:27:38 lukem Exp $ */
/*
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
/* suck the data from the kernel */
#define _KDEREFOK(kd, addr, dst, sz) \
- (kvm_read((kd), (addr), (dst), (sz)) == (sz))
+ ((size_t)kvm_read((kd), (addr), (dst), (sz)) == (size_t)(sz))
#define _KDEREF(kd, addr, dst, sz) do { \
if (!_KDEREFOK((kd), (addr), (dst), (sz))) \
errx(1, "trying to read %lu bytes from %lx: %s", \
