[Pkg-shadow-commits] r1667 - in upstream/trunk: . lib
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Sun Jan 6 13:12:09 UTC 2008
Author: nekral-guest
Date: 2008-01-06 13:12:09 +0000 (Sun, 06 Jan 2008)
New Revision: 1667
Modified:
upstream/trunk/ChangeLog
upstream/trunk/lib/defines.h
Log:
* Remove teh macro definition of SETXXENT_TYPE,
SETXXENT_RET, and SETXXENT_TEST. They were used by the now
removed pwent.c and grent.c.
* Remove the definition of PASSWD_PAG_FILE,
GROUP_PAG_FILE, SHADOW_PAG_FILE, and SGROUP_PAG_FILE. They are
never used.
* Don't include "snprintf.h". The file does not
exist in shadow.
* Add new macro unused to tag unused parameters.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2008-01-06 13:00:17 UTC (rev 1666)
+++ upstream/trunk/ChangeLog 2008-01-06 13:12:09 UTC (rev 1667)
@@ -1,5 +1,17 @@
2008-01-06 Nicolas François <nicolas.francois at centraliens.net>
+ * lib/defines.h: Remove teh macro definition of SETXXENT_TYPE,
+ SETXXENT_RET, and SETXXENT_TEST. They were used by the now
+ removed pwent.c and grent.c.
+ * lib/defines.h: Remove the definition of PASSWD_PAG_FILE,
+ GROUP_PAG_FILE, SHADOW_PAG_FILE, and SGROUP_PAG_FILE. They are
+ never used.
+ * lib/defines.h: Don't include "snprintf.h". The file does not
+ exist in shadow.
+ * lib/defines.h: Add new macro unused to tag unused parameters.
+
+2008-01-06 Nicolas François <nicolas.francois at centraliens.net>
+
* src/useradd.c, src/groupmems.c: Assume optarg and optind are
declared in <getopt.h>.
Modified: upstream/trunk/lib/defines.h
===================================================================
--- upstream/trunk/lib/defines.h 2008-01-06 13:00:17 UTC (rev 1666)
+++ upstream/trunk/lib/defines.h 2008-01-06 13:12:09 UTC (rev 1667)
@@ -262,19 +262,6 @@
#define STRFCPY(A,B) \
(strncpy((A), (B), sizeof(A) - 1), (A)[sizeof(A) - 1] = '\0')
-/* get rid of a few ugly repeated #ifdefs in pwent.c and grent.c */
-/* XXX - this is ugly too, configure should test it and not check for
- any hardcoded system names, if possible. --marekm */
-#if defined(AIX) || defined(__linux__)
-#define SETXXENT_TYPE void
-#define SETXXENT_RET(x) return
-#define SETXXENT_TEST(x) x; if (0) /* compiler should optimize this away */
-#else
-#define SETXXENT_TYPE int
-#define SETXXENT_RET(x) return(x)
-#define SETXXENT_TEST(x) if (x)
-#endif
-
#ifndef PASSWD_FILE
#define PASSWD_FILE "/etc/passwd"
#endif
@@ -293,11 +280,6 @@
#endif
#endif
-#define PASSWD_PAG_FILE PASSWD_FILE ".pag"
-#define GROUP_PAG_FILE GROUP_FILE ".pag"
-#define SHADOW_PAG_FILE SHADOW_FILE ".pag"
-#define SGROUP_PAG_FILE SGROUP_FILE ".pag"
-
#ifndef NULL
#define NULL ((void *) 0)
#endif
@@ -310,10 +292,6 @@
# endif
#endif
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
/*
* string to use for the pw_passwd field in /etc/passwd when using
* shadow passwords - most systems use "x" but there are a few
@@ -334,4 +312,11 @@
#include <libaudit.h>
#endif
+/* To be used for verified unused parameters */
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+# define unused __attribute__((unused))
+#else
+# define unused
+#endif
+
#endif /* _DEFINES_H_ */
More information about the Pkg-shadow-commits
mailing list