Remove unused macros, fix a debug_decl

diff --git a/plugins/sudoers/pwutil.c b/plugins/sudoers/pwutil.c
index 1c4901d41f7ce8b6a8e6ad056b634ea2ffa955c6..6ecb0b4304bec46ab0ae9323e20f3e9f084e9cb3 100644 (file)
--- a/plugins/sudoers/pwutil.c
+++ b/plugins/sudoers/pwutil.c
@@ -88,23 +88,6 @@ cmp_pwnam(const void *v1, const void *v2)
     return strcmp(ci1->k.name, ci2->k.name);
 }
 
-#define FIELD_SIZE(src, name, size)                    \
-do {                                                   \
-       if (src->name) {                                \
-               size = strlen(src->name) + 1;           \
-               total += size;                          \
-       }                                               \
-} while (0)
-
-#define FIELD_COPY(src, dst, name, size)               \
-do {                                                   \
-       if (src->name) {                                \
-               memcpy(cp, src->name, size);            \
-               dst->name = cp;                         \
-               cp += size;                             \
-       }                                               \
-} while (0)
-
 void
 sudo_pw_addref(struct passwd *pw)
 {
@@ -224,7 +207,7 @@ sudo_fakepwnamid(const char *user, uid_t uid, gid_t gid)
     struct rbnode *node;
     size_t len, namelen;
     int i;
-    debug_decl(sudo_fakepwnam, SUDO_DEBUG_NSS)
+    debug_decl(sudo_fakepwnamid, SUDO_DEBUG_NSS)
 
     namelen = strlen(user);
     len = sizeof(*pwitem) + namelen + 1 /* pw_name */ +