d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused variables.

Browse Source 
Simply annotate the function parameters with __unused, instead of adding
the ve-variables. This makes the code build with GCC 4.7 and -Werror.
This commit is contained in:
Ed Schouten 2012-01-17 22:17:10 +00:00
parent 5c952e8d1b
commit 6aed20fe1a
1 changed files with 30 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
bin/ps/print.c
View File

@ -99,10 +99,8 @@ printheader(void)
char * char *
arguments(KINFO *k, VARENT *ve) arguments(KINFO *k, VARENT *ve)
{ {
VAR *v;
char *vis_args; char *vis_args;
v = ve->var;
if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL) if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
errx(1, "malloc failed"); errx(1, "malloc failed");
strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH); strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);
@ -116,10 +114,8 @@ arguments(KINFO *k, VARENT *ve)
char * char *
command(KINFO *k, VARENT *ve) command(KINFO *k, VARENT *ve)
{ {
VAR *v;
char *vis_args, *vis_env, *str; char *vis_args, *vis_env, *str;
v = ve->var;
if (cflag) { if (cflag) {
/* If it is the last field, then don't pad */ /* If it is the last field, then don't pad */
if (STAILQ_NEXT(ve, next_ve) == NULL) { if (STAILQ_NEXT(ve, next_ve) == NULL) {
@ -172,10 +168,8 @@ command(KINFO *k, VARENT *ve)
char * char *
ucomm(KINFO *k, VARENT *ve) ucomm(KINFO *k, VARENT *ve)
{ {
VAR *v;
char *str; char *str;
v = ve->var;
if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field, don't pad */ if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field, don't pad */
asprintf(&str, "%s%s%s%s", asprintf(&str, "%s%s%s%s",
k->ki_d.prefix ? k->ki_d.prefix : "", k->ki_d.prefix ? k->ki_d.prefix : "",
@ -192,12 +186,10 @@ ucomm(KINFO *k, VARENT *ve)
} }
char * char *
tdnam(KINFO *k, VARENT *ve) tdnam(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
char *str; char *str;
v = ve->var;
if (showthreads && k->ki_p->ki_numthreads > 1) if (showthreads && k->ki_p->ki_numthreads > 1)
str = strdup(k->ki_p->ki_tdname); str = strdup(k->ki_p->ki_tdname);
else else
@ -207,28 +199,24 @@ tdnam(KINFO *k, VARENT *ve)
} }
char * char *
logname(KINFO *k, VARENT *ve) logname(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
v = ve->var;
if (*k->ki_p->ki_login == '\0') if (*k->ki_p->ki_login == '\0')
return (NULL); return (NULL);
return (strdup(k->ki_p->ki_login)); return (strdup(k->ki_p->ki_login));
} }
char * char *
state(KINFO *k, VARENT *ve) state(KINFO *k, VARENT *ve __unused)
{ {
int flag, tdflags; int flag, tdflags;
char *cp, *buf; char *cp, *buf;
VAR *v;
buf = malloc(16); buf = malloc(16);
if (buf == NULL) if (buf == NULL)
errx(1, "malloc failed"); errx(1, "malloc failed");
v = ve->var;
flag = k->ki_p->ki_flag; flag = k->ki_p->ki_flag;
tdflags = k->ki_p->ki_tdflags; /* XXXKSE */ tdflags = k->ki_p->ki_tdflags; /* XXXKSE */
cp = buf; cp = buf;
@ -294,72 +282,58 @@ state(KINFO *k, VARENT *ve)
#define scalepri(x) ((x) - PZERO) #define scalepri(x) ((x) - PZERO)
char * char *
pri(KINFO *k, VARENT *ve) pri(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
char *str; char *str;
v = ve->var;
asprintf(&str, "%d", scalepri(k->ki_p->ki_pri.pri_level)); asprintf(&str, "%d", scalepri(k->ki_p->ki_pri.pri_level));
return (str); return (str);
} }
char * char *
upr(KINFO *k, VARENT *ve) upr(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
char *str; char *str;
v = ve->var;
asprintf(&str, "%d", scalepri(k->ki_p->ki_pri.pri_user)); asprintf(&str, "%d", scalepri(k->ki_p->ki_pri.pri_user));
return (str); return (str);
} }
#undef scalepri #undef scalepri
char * char *
uname(KINFO *k, VARENT *ve) uname(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
v = ve->var;
return (strdup(user_from_uid(k->ki_p->ki_uid, 0))); return (strdup(user_from_uid(k->ki_p->ki_uid, 0)));
} }
char * char *
egroupname(KINFO *k, VARENT *ve) egroupname(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
v = ve->var;
return (strdup(group_from_gid(k->ki_p->ki_groups[0], 0))); return (strdup(group_from_gid(k->ki_p->ki_groups[0], 0)));
} }
char * char *
rgroupname(KINFO *k, VARENT *ve) rgroupname(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
v = ve->var;
return (strdup(group_from_gid(k->ki_p->ki_rgid, 0))); return (strdup(group_from_gid(k->ki_p->ki_rgid, 0)));
} }
char * char *
runame(KINFO *k, VARENT *ve) runame(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
v = ve->var;
return (strdup(user_from_uid(k->ki_p->ki_ruid, 0))); return (strdup(user_from_uid(k->ki_p->ki_ruid, 0)));
} }
char * char *
tdev(KINFO *k, VARENT *ve) tdev(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
dev_t dev; dev_t dev;
char *str; char *str;
v = ve->var;
dev = k->ki_p->ki_tdev; dev = k->ki_p->ki_tdev;
if (dev == NODEV) if (dev == NODEV)
str = strdup("-"); str = strdup("-");
@ -370,13 +344,11 @@ tdev(KINFO *k, VARENT *ve)
} }
char * char *
tname(KINFO *k, VARENT *ve) tname(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
dev_t dev; dev_t dev;
char *ttname, *str; char *ttname, *str;
v = ve->var;
dev = k->ki_p->ki_tdev; dev = k->ki_p->ki_tdev;
if (dev == NODEV || (ttname = devname(dev, S_IFCHR)) == NULL) if (dev == NODEV || (ttname = devname(dev, S_IFCHR)) == NULL)
str = strdup("- "); str = strdup("- ");
@ -394,13 +366,11 @@ tname(KINFO *k, VARENT *ve)
} }
char * char *
longtname(KINFO *k, VARENT *ve) longtname(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
dev_t dev; dev_t dev;
const char *ttname; const char *ttname;
v = ve->var;
dev = k->ki_p->ki_tdev; dev = k->ki_p->ki_tdev;
if (dev == NODEV || (ttname = devname(dev, S_IFCHR)) == NULL) if (dev == NODEV || (ttname = devname(dev, S_IFCHR)) == NULL)
ttname = "-"; ttname = "-";
@ -409,9 +379,8 @@ longtname(KINFO *k, VARENT *ve)
} }
char * char *
started(KINFO *k, VARENT *ve) started(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
time_t then; time_t then;
struct tm *tp; struct tm *tp;
static int use_ampm = -1; static int use_ampm = -1;
@ -422,7 +391,6 @@ started(KINFO *k, VARENT *ve)
if (buf == NULL) if (buf == NULL)
errx(1, "malloc failed"); errx(1, "malloc failed");
v = ve->var;
if (!k->ki_valid) if (!k->ki_valid)
return (NULL); return (NULL);
if (use_ampm < 0) if (use_ampm < 0)
@ -441,9 +409,8 @@ started(KINFO *k, VARENT *ve)
} }
char * char *
lstarted(KINFO *k, VARENT *ve) lstarted(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
time_t then; time_t then;
char *buf; char *buf;
size_t buflen = 100; size_t buflen = 100;
@ -452,7 +419,6 @@ lstarted(KINFO *k, VARENT *ve)
if (buf == NULL) if (buf == NULL)
errx(1, "malloc failed"); errx(1, "malloc failed");
v = ve->var;
if (!k->ki_valid) if (!k->ki_valid)
return (NULL); return (NULL);
then = k->ki_p->ki_start.tv_sec; then = k->ki_p->ki_start.tv_sec;
@ -461,12 +427,10 @@ lstarted(KINFO *k, VARENT *ve)
} }
char * char *
lockname(KINFO *k, VARENT *ve) lockname(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
char *str; char *str;
v = ve->var;
if (k->ki_p->ki_kiflag & KI_LOCKBLOCK) { if (k->ki_p->ki_kiflag & KI_LOCKBLOCK) {
if (k->ki_p->ki_lockname[0] != 0) if (k->ki_p->ki_lockname[0] != 0)
str = strdup(k->ki_p->ki_lockname); str = strdup(k->ki_p->ki_lockname);
@ -479,12 +443,10 @@ lockname(KINFO *k, VARENT *ve)
} }
char * char *
wchan(KINFO *k, VARENT *ve) wchan(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
char *str; char *str;
v = ve->var;
if (k->ki_p->ki_wchan) { if (k->ki_p->ki_wchan) {
if (k->ki_p->ki_wmesg[0] != 0) if (k->ki_p->ki_wmesg[0] != 0)
str = strdup(k->ki_p->ki_wmesg); str = strdup(k->ki_p->ki_wmesg);
@ -497,12 +459,10 @@ wchan(KINFO *k, VARENT *ve)
} }
char * char *
nwchan(KINFO *k, VARENT *ve) nwchan(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
char *str; char *str;
v = ve->var;
if (k->ki_p->ki_wchan) if (k->ki_p->ki_wchan)
asprintf(&str, "%0lx", (long)k->ki_p->ki_wchan); asprintf(&str, "%0lx", (long)k->ki_p->ki_wchan);
else else
@ -512,12 +472,10 @@ nwchan(KINFO *k, VARENT *ve)
} }
char * char *
mwchan(KINFO *k, VARENT *ve) mwchan(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
char *str; char *str;
v = ve->var;
if (k->ki_p->ki_wchan) { if (k->ki_p->ki_wchan) {
if (k->ki_p->ki_wmesg[0] != 0) if (k->ki_p->ki_wmesg[0] != 0)
str = strdup(k->ki_p->ki_wmesg); str = strdup(k->ki_p->ki_wmesg);
@ -535,27 +493,23 @@ mwchan(KINFO *k, VARENT *ve)
} }
char * char *
vsize(KINFO *k, VARENT *ve) vsize(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
char *str; char *str;
v = ve->var;
asprintf(&str, "%lu", (u_long)(k->ki_p->ki_size / 1024)); asprintf(&str, "%lu", (u_long)(k->ki_p->ki_size / 1024));
return (str); return (str);
} }
static char * static char *
printtime(KINFO *k, VARENT *ve, long secs, long psecs) printtime(KINFO *k, VARENT *ve __unused, long secs, long psecs)
/* psecs is "parts" of a second. first micro, then centi */ /* psecs is "parts" of a second. first micro, then centi */
{ {
VAR *v;
static char decimal_point; static char decimal_point;
char *str; char *str;
if (decimal_point == '\0') if (decimal_point == '\0')
decimal_point = localeconv()->decimal_point[0]; decimal_point = localeconv()->decimal_point[0];
v = ve->var;
if (!k->ki_valid) { if (!k->ki_valid) {
secs = 0; secs = 0;
psecs = 0; psecs = 0;
@ -618,14 +572,12 @@ usertime(KINFO *k, VARENT *ve)
} }
char * char *
elapsed(KINFO *k, VARENT *ve) elapsed(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
time_t val; time_t val;
int days, hours, mins, secs; int days, hours, mins, secs;
char *str; char *str;
v = ve->var;
if (!k->ki_valid) if (!k->ki_valid)
return (NULL); return (NULL);
val = now - k->ki_p->ki_start.tv_sec; val = now - k->ki_p->ki_start.tv_sec;
@ -646,13 +598,11 @@ elapsed(KINFO *k, VARENT *ve)
} }
char * char *
elapseds(KINFO *k, VARENT *ve) elapseds(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
time_t val; time_t val;
char *str; char *str;
v = ve->var;
if (!k->ki_valid) if (!k->ki_valid)
return (NULL); return (NULL);
val = now - k->ki_p->ki_start.tv_sec; val = now - k->ki_p->ki_start.tv_sec;
@ -682,12 +632,10 @@ getpcpu(const KINFO *k)
} }
char * char *
pcpu(KINFO *k, VARENT *ve) pcpu(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
char *str; char *str;
v = ve->var;
asprintf(&str, "%.1f", getpcpu(k)); asprintf(&str, "%.1f", getpcpu(k));
return (str); return (str);
} }
@ -712,47 +660,39 @@ getpmem(KINFO *k)
} }
char * char *
pmem(KINFO *k, VARENT *ve) pmem(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
char *str; char *str;
v = ve->var;
asprintf(&str, "%.1f", getpmem(k)); asprintf(&str, "%.1f", getpmem(k));
return (str); return (str);
} }
char * char *
pagein(KINFO *k, VARENT *ve) pagein(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
char *str; char *str;
v = ve->var;
asprintf(&str, "%ld", k->ki_valid ? k->ki_p->ki_rusage.ru_majflt : 0); asprintf(&str, "%ld", k->ki_valid ? k->ki_p->ki_rusage.ru_majflt : 0);
return (str); return (str);
} }
/* ARGSUSED */ /* ARGSUSED */
char * char *
maxrss(KINFO *k __unused, VARENT *ve) maxrss(KINFO *k __unused, VARENT *ve __unused)
{ {
VAR *v;
v = ve->var;
/* XXX not yet */ /* XXX not yet */
return (NULL); return (NULL);
} }
char * char *
priorityr(KINFO *k, VARENT *ve) priorityr(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
struct priority *lpri; struct priority *lpri;
char *str; char *str;
unsigned class, level; unsigned class, level;
v = ve->var;
lpri = &k->ki_p->ki_pri; lpri = &k->ki_p->ki_pri;
class = lpri->pri_class; class = lpri->pri_class;
level = lpri->pri_level; level = lpri->pri_level;
@ -852,25 +792,21 @@ rvar(KINFO *k, VARENT *ve)
} }
char * char *
emulname(KINFO *k, VARENT *ve) emulname(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
v = ve->var;
if (k->ki_p->ki_emul == NULL) if (k->ki_p->ki_emul == NULL)
return (NULL); return (NULL);
return (strdup(k->ki_p->ki_emul)); return (strdup(k->ki_p->ki_emul));
} }
char * char *
label(KINFO *k, VARENT *ve) label(KINFO *k, VARENT *ve __unused)
{ {
char *string; char *string;
VAR *v;
mac_t proclabel; mac_t proclabel;
int error; int error;
v = ve->var;
string = NULL; string = NULL;
if (mac_prepare_process_label(&proclabel) == -1) { if (mac_prepare_process_label(&proclabel) == -1) {
warn("mac_prepare_process_label"); warn("mac_prepare_process_label");
@ -887,12 +823,10 @@ out:
} }
char * char *
loginclass(KINFO *k, VARENT *ve) loginclass(KINFO *k, VARENT *ve __unused)
{ {
VAR *v;
char *s; char *s;
v = ve->var;
/* /*
* Don't display login class for system processes; * Don't display login class for system processes;
* login classes are used for resource limits, * login classes are used for resource limits,