summaryrefslogtreecommitdiffstats
path: root/bin/ps/ps.c
diff options
context:
space:
mode:
authorjoerg <joerg@FreeBSD.org>1995-03-19 13:29:28 +0000
committerjoerg <joerg@FreeBSD.org>1995-03-19 13:29:28 +0000
commitc6030c6511c69b69a216c893957b01bfc264d365 (patch)
tree163891f0a6f18e48e3d38e4d107ad82c2f5c570a /bin/ps/ps.c
parent568f2efc88b72b511e26d42250ac4250a6610415 (diff)
downloadFreeBSD-src-c6030c6511c69b69a216c893957b01bfc264d365.zip
FreeBSD-src-c6030c6511c69b69a216c893957b01bfc264d365.tar.gz
You will find enclosed some changes to make gcc -Wall more happy in
/usr/src/bin. Note that some patches are still needed in that directory. I (Joerg) finished most of Philippe's cleanup. /bin/sh will still need *allot* of work, however. Submitted by: charnier@lirmm.fr (Philippe Charnier)
Diffstat (limited to 'bin/ps/ps.c')
-rw-r--r--bin/ps/ps.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 85a03e4..831649b 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ps.c,v 1.4 1994/10/02 08:33:31 davidg Exp $
+ * $Id: ps.c,v 1.5 1994/10/18 04:27:46 davidg Exp $
*/
#ifndef lint
@@ -384,7 +384,7 @@ saveuser(ki)
struct user *u_addr = (struct user *)USRSTACK;
usp = &ki->ki_u;
- if (kvm_uread(kd, KI_PROC(ki), &u_addr->u_stats,
+ if (kvm_uread(kd, KI_PROC(ki), (unsigned long)&u_addr->u_stats,
(char *)&pstats, sizeof(pstats)) == sizeof(pstats)) {
/*
* The u-area might be swapped out, and we can't get
@@ -486,8 +486,9 @@ kludge_oldps_options(s)
* if there's a trailing number, and not a preceding 'p' (pid) or
* 't' (tty) flag, then assume it's a pid and insert a 'p' flag.
*/
- if (isdigit(*cp) && (cp == s || cp[-1] != 't' && cp[-1] != 'p' &&
- (cp - 1 == s || cp[-2] != 't')))
+ if (isdigit(*cp) &&
+ (cp == s || (cp[-1] != 't' && cp[-1] != 'p')) &&
+ (cp - 1 == s || cp[-2] != 't'))
*ns++ = 'p';
(void)strcpy(ns, cp); /* and append the number */
OpenPOWER on IntegriCloud