* src/groupmems.c: EXIT_READ_GROUP changed to EXIT_INVALID_GROUP.

	* src/groupmems.c: EXIT_INVALID_USERNAME changed to EXIT_INVALID_USER.
	* src/groupmems.c: Fix typos.

diff --git a/ChangeLog b/ChangeLog
index fe066e8402ed973e8129bd58ac6f479f4b9ecca0..8a2d1d33d87c445a648e458438f80d26c7b125b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-27  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/groupmems.c: EXIT_READ_GROUP changed to EXIT_INVALID_GROUP.
+       * src/groupmems.c: EXIT_INVALID_USERNAME changed to EXIT_INVALID_USER.
+
 2008-07-26  Nicolas François  <nicolas.francois@centraliens.net>
 
        * src/groupmems.c: Really use booleans.

diff --git a/src/groupmems.c b/src/groupmems.c
index e4a27060cae4527c10290a3f751453515702b5c3..af38c896b05e59ffed6b8e300b26fb853142bb8c 100644 (file)
--- a/src/groupmems.c
+++ b/src/groupmems.c
@@ -68,7 +68,7 @@ static bool list = false;
 static int exclusive = 0;
 static char *Prog;
 
-#define isroot ()              (getuid () == 0)
+#define isroot()               (getuid () == 0)
 
 static int isgroup (void)
 {
@@ -86,7 +86,7 @@ static char *whoami (void)
        struct passwd *usr = getpwuid (getuid ());
 
        if (0 == strcmp (usr->pw_name, grp->gr_name)) {
-               return (char *) strdup (usr->pw_name);
+               return strdup (usr->pw_name);
        } else {
                return NULL;
        }
@@ -226,10 +226,10 @@ int main (int argc, char **argv)
        }
 
        /* local, no need for xgetpwnam */
-       if (getpwnam(adduser) == NULL) {
-               fprintf (stderr, _("%s: user `%s' does not exist\n")
+       if (getpwnam (adduser) == NULL) {
+               fprintf (stderr, _("%s: user `%s' does not exist\n"),
                         Prog, adduser);
-               exit (EXIT_INVALID_USERNAME);
+               exit (EXIT_INVALID_USER);
        }
 
        if (!isroot () && NULL != thisgroup) {
@@ -296,7 +296,7 @@ int main (int argc, char **argv)
        if (grp == NULL) {
                fprintf (stderr, _("%s: `%s' not found in /etc/group\n"),
                         Prog, name);
-               exit (EXIT_READ_GROUP);
+               exit (EXIT_INVALID_GROUP);
        }
 
        if (NULL != adduser) {