emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

library: rename clashing pwcache functions

Browse Source 
On MacOS the system already has user_from_uid and group_from_gid.
These are renamed pwcache_get_user and pwcache_get_group.

They were also exported but did not appear in the symbol file
or used by any of the procps binaries. They are no longer exported.

References:
 https://gitlab.com/procps-ng/procps/issues/34

Signed-off-by: Craig Small <csmall@enc.com.au>
This commit is contained in:
Craig Small
2016-06-18 08:17:45 +10:00
parent 2a7d3f7d70
commit 5a244c1095
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proc/pwcache.c
View File

@ -43,7 +43,7 @@ static struct pwbuf {
char name[P_G_SZ];
} *pwhash[HASHSIZE];
PROCPS_EXPORT char *user_from_uid(uid_t uid) {
char *pwcache_get_user(uid_t uid) {
struct pwbuf **p;
struct passwd *pw;
@ -71,7 +71,7 @@ static struct grpbuf {
char name[P_G_SZ];
} *grphash[HASHSIZE];
PROCPS_EXPORT char *group_from_gid(gid_t gid) {
char *pwcache_get_group(gid_t gid) {
struct grpbuf **g;
struct group *gr;