ps: Rename local routine name from uname to usrname
This removes symbol name routine clash with libc's uname(3). This allows to build ps(1) against LLVM Sanitizers. Sponsored by <The NetBSD Foundation>
This commit is contained in:
parent
d4bb06ab9d
commit
b42c7b02bc
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: extern.h,v 1.38 2016/12/02 21:59:03 christos Exp $ */
|
||||
/* $NetBSD: extern.h,v 1.39 2017/12/09 14:56:54 kamil Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993, 1994
|
||||
|
@ -93,7 +93,7 @@ void tdev(struct pinfo *, VARENT *, enum mode);
|
|||
void tname(struct pinfo *, VARENT *, enum mode);
|
||||
void tsize(struct pinfo *, VARENT *, enum mode);
|
||||
void ucomm(struct pinfo *, VARENT *, enum mode);
|
||||
void uname(struct pinfo *, VARENT *, enum mode);
|
||||
void usrname(struct pinfo *, VARENT *, enum mode);
|
||||
void uvar(struct pinfo *, VARENT *, enum mode);
|
||||
void vsize(struct pinfo *, VARENT *, enum mode);
|
||||
void wchan(struct pinfo *, VARENT *, enum mode);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: keyword.c,v 1.54 2014/01/15 08:07:53 mlelstv Exp $ */
|
||||
/* $NetBSD: keyword.c,v 1.55 2017/12/09 14:56:54 kamil Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990, 1993, 1994
|
||||
|
@ -34,7 +34,7 @@
|
|||
#if 0
|
||||
static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94";
|
||||
#else
|
||||
__RCSID("$NetBSD: keyword.c,v 1.54 2014/01/15 08:07:53 mlelstv Exp $");
|
||||
__RCSID("$NetBSD: keyword.c,v 1.55 2017/12/09 14:56:54 kamil Exp $");
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
|
@ -126,7 +126,7 @@ VAR var[] = {
|
|||
VAR4("emul", "EMUL", LJUST, emul),
|
||||
VAR6("etime", "ELAPSED", 0, elapsed, POFF(p_ustart_sec), TIMEVAL),
|
||||
UID("euid", "EUID", p_uid),
|
||||
VAR4("euser", "EUSER", LJUST, uname),
|
||||
VAR4("euser", "EUSER", LJUST, usrname),
|
||||
PVAR("f", "F", 0, p_flag, INT, "x"),
|
||||
VAR3("flags", "f", ALIAS),
|
||||
GID("gid", "GID", p_gid),
|
||||
|
@ -213,7 +213,7 @@ VAR var[] = {
|
|||
VAR4("ucomm", "UCOMM", LJUST, ucomm),
|
||||
UID("uid", "UID", p_uid),
|
||||
LVAR("upr", "UPR", 0, l_usrpri, UCHAR, "u"),
|
||||
VAR4("user", "USER", LJUST, uname),
|
||||
VAR4("user", "USER", LJUST, usrname),
|
||||
VAR3("usrpri", "upr", ALIAS),
|
||||
VAR6("utime", "UTIME", 0, putimeval, POFF(p_uutime_sec), TIMEVAL),
|
||||
VAR3("vsize", "vsz", ALIAS),
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: print.c,v 1.127 2016/12/12 20:35:36 christos Exp $ */
|
||||
/* $NetBSD: print.c,v 1.128 2017/12/09 14:56:54 kamil Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000, 2007 The NetBSD Foundation, Inc.
|
||||
|
@ -63,7 +63,7 @@
|
|||
#if 0
|
||||
static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
|
||||
#else
|
||||
__RCSID("$NetBSD: print.c,v 1.127 2016/12/12 20:35:36 christos Exp $");
|
||||
__RCSID("$NetBSD: print.c,v 1.128 2017/12/09 14:56:54 kamil Exp $");
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
|
@ -629,7 +629,7 @@ pri(struct pinfo *pi, VARENT *ve, enum mode mode)
|
|||
}
|
||||
|
||||
void
|
||||
uname(struct pinfo *pi, VARENT *ve, enum mode mode)
|
||||
usrname(struct pinfo *pi, VARENT *ve, enum mode mode)
|
||||
{
|
||||
struct kinfo_proc2 *k = pi->ki;
|
||||
VAR *v;
|
||||
|
|
Loading…
Reference in New Issue