summaryrefslogtreecommitdiff
path: root/libpwdgrp/pwd_grp_internal.c
diff options
context:
space:
mode:
authorDenis Vlasenko2006-12-30 21:11:57 +0000
committerDenis Vlasenko2006-12-30 21:11:57 +0000
commitcb04ff5c68c1363837d8cd9f2170bdf64625b872 (patch)
treeadde9e8d46920ae48f3768e6b7fa76bdd123f618 /libpwdgrp/pwd_grp_internal.c
parent80602a98bcc3100279e09e1291d47a0adb6addb1 (diff)
downloadbusybox-cb04ff5c68c1363837d8cd9f2170bdf64625b872.zip
busybox-cb04ff5c68c1363837d8cd9f2170bdf64625b872.tar.gz
fixdep.c: avoit doing memcmp in most cases
uidgid_get.c: add forgotten copyright notice pwd/grp/shadow: avoid collisions with libc names
Diffstat (limited to 'libpwdgrp/pwd_grp_internal.c')
-rw-r--r--libpwdgrp/pwd_grp_internal.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libpwdgrp/pwd_grp_internal.c b/libpwdgrp/pwd_grp_internal.c
index 866ed36..d55edc3 100644
--- a/libpwdgrp/pwd_grp_internal.c
+++ b/libpwdgrp/pwd_grp_internal.c
@@ -22,7 +22,7 @@
#error GETXXKEY_R_FUNC is not defined!
#endif
-int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
+int GETXXKEY_R_FUNC(GETXXKEY_R_KEYTYPE key,
GETXXKEY_R_ENTTYPE *__restrict resultbuf,
char *__restrict buffer, size_t buflen,
GETXXKEY_R_ENTTYPE **__restrict result)
@@ -32,11 +32,11 @@ int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
*result = NULL;
- stream = fopen(DO_GETXXKEY_R_PATHNAME, "r");
+ stream = fopen(GETXXKEY_R_PATHNAME, "r");
if (!stream)
return errno;
while (1) {
- rv = __pgsreader(GETXXKEY_R_PARSER, resultbuf, buffer, buflen, stream);
+ rv = bb__pgsreader(GETXXKEY_R_PARSER, resultbuf, buffer, buflen, stream);
if (!rv) {
if (GETXXKEY_R_TEST(resultbuf)) { /* Found key? */
*result = resultbuf;
@@ -58,5 +58,5 @@ int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
#undef GETXXKEY_R_PARSER
#undef GETXXKEY_R_ENTTYPE
#undef GETXXKEY_R_TEST
-#undef DO_GETXXKEY_R_KEYTYPE
-#undef DO_GETXXKEY_R_PATHNAME
+#undef GETXXKEY_R_KEYTYPE
+#undef GETXXKEY_R_PATHNAME