Module Name: src
Committed By: lukem
Date: Mon Apr 13 00:12:16 UTC 2009
Modified Files:
src/usr.bin/pkill: Makefile pkill.c
Log Message:
Fix sign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/pkill/Makefile
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/pkill/pkill.c
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/pkill/Makefile
diff -u src/usr.bin/pkill/Makefile:1.2 src/usr.bin/pkill/Makefile:1.3
--- src/usr.bin/pkill/Makefile:1.2 Sat Jul 16 16:21:05 2005
+++ src/usr.bin/pkill/Makefile Mon Apr 13 00:12:16 2009
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2005/07/16 16:21:05 christos Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/13 00:12:16 lukem Exp $
PROG= pkill
-WARNS= 3
LDADD+= -lkvm
DPADD+= ${LIBKVM}
Index: src/usr.bin/pkill/pkill.c
diff -u src/usr.bin/pkill/pkill.c:1.24 src/usr.bin/pkill/pkill.c:1.25
--- src/usr.bin/pkill/pkill.c:1.24 Sat Feb 28 18:16:11 2009
+++ src/usr.bin/pkill/pkill.c Mon Apr 13 00:12:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pkill.c,v 1.24 2009/02/28 18:16:11 christos Exp $ */
+/* $NetBSD: pkill.c,v 1.25 2009/04/13 00:12:16 lukem Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: pkill.c,v 1.24 2009/02/28 18:16:11 christos Exp $");
+__RCSID("$NetBSD: pkill.c,v 1.25 2009/04/13 00:12:16 lukem Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -260,7 +260,7 @@
continue;
j = 0;
- while (j < sizeof(buf) && *pargv != NULL) {
+ while (j < (int)sizeof(buf) && *pargv != NULL) {
j += snprintf(buf + j, sizeof(buf) - j,
pargv[1] != NULL ? "%s " : "%s",
pargv[0]);
@@ -275,7 +275,7 @@
if (rv == 0) {
if (fullmatch) {
if (regmatch.rm_so == 0 &&
- regmatch.rm_eo == strlen(mstr))
+ regmatch.rm_eo == (regoff_t)strlen(mstr))
selected[i] = 1;
} else
selected[i] = 1;
@@ -319,7 +319,7 @@
}
SLIST_FOREACH(li, &ppidlist, li_chain)
- if (kp->p_ppid == (uid_t)li->li_number)
+ if ((uid_t)kp->p_ppid == (uid_t)li->li_number)
break;
if (SLIST_FIRST(&ppidlist) != NULL && li == NULL) {
selected[i] = 0;
@@ -327,7 +327,7 @@
}
SLIST_FOREACH(li, &pgrplist, li_chain)
- if (kp->p__pgid == (uid_t)li->li_number)
+ if (kp->p__pgid == (pid_t)li->li_number)
break;
if (SLIST_FIRST(&pgrplist) != NULL && li == NULL) {
selected[i] = 0;
@@ -347,7 +347,7 @@
}
SLIST_FOREACH(li, &sidlist, li_chain)
- if (kp->p_sid == (uid_t)li->li_number)
+ if (kp->p_sid == (pid_t)li->li_number)
break;
if (SLIST_FIRST(&sidlist) != NULL && li == NULL) {
selected[i] = 0;
