* src/chgpasswd.c: Use a bool when possible instead of int

	integers.
	* src/chgpasswd.c: Ignore return value of setlocale(),
	bindtextdomain(), and textdomain().
	* src/chgpasswd.c: Avoid implicit conversion of integers to
	booleans.

diff --git a/ChangeLog b/ChangeLog
index 012624f60a0309f313fec83ad741053217057491..4f03f6b4befd2b38ac72361f1d818b478af97470 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-09  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/chgpasswd.c: Use a bool when possible instead of int
+       integers.
+       * src/chgpasswd.c: Ignore return value of setlocale(),
+       bindtextdomain(), and textdomain().
+       * src/chgpasswd.c: Avoid implicit conversion of integers to
+       booleans.
+
 2008-06-09  Nicolas François  <nicolas.francois@centraliens.net>
 
        * src/groupdel.c: Use a bool when possible instead of int

diff --git a/src/chgpasswd.c b/src/chgpasswd.c
index c34a709bb555fe0339244862f79b6b075407aa7f..fc3110e8175a1cbd5a7c9c6c731919c02723588c 100644 (file)
--- a/src/chgpasswd.c
+++ b/src/chgpasswd.c
@@ -53,16 +53,16 @@
  * Global variables
  */
 static char *Prog;
-static int cflg = 0;
-static int eflg = 0;
-static int md5flg = 0;
-static int sflg = 0;
+static bool cflg   = false;
+static bool eflg   = false;
+static bool md5flg = false;
+static bool sflg   = false;
 
 static const char *crypt_method = NULL;
 static long sha_rounds = 5000;
 
 #ifdef SHADOWGRP
-static int is_shadow_grp;
+static bool is_shadow_grp;
 #endif
 
 #ifdef USE_PAM
@@ -133,22 +133,22 @@ static void process_flags (int argc, char **argv)
                                 long_options, &option_index)) != -1) {
                switch (c) {
                case 'c':
-                       cflg = 1;
+                       cflg = true;
                        crypt_method = optarg;
                        break;
                case 'e':
-                       eflg = 1;
+                       eflg = true;
                        break;
                case 'h':
                        usage ();
                        break;
                case 'm':
-                       md5flg = 1;
+                       md5flg = true;
                        break;
 #ifdef USE_SHA_CRYPT
                case 's':
-                       sflg = 1;
-                       if (!getlong(optarg, &sha_rounds)) {
+                       sflg = true;
+                       if (getlong(optarg, &sha_rounds) != 0) {
                                fprintf (stderr,
                                         _("%s: invalid numeric argument '%s'\n"),
                                         Prog, optarg);
@@ -337,9 +337,9 @@ int main (int argc, char **argv)
 
        Prog = Basename (argv[0]);
 
-       setlocale (LC_ALL, "");
-       bindtextdomain (PACKAGE, LOCALEDIR);
-       textdomain (PACKAGE);
+       (void) setlocale (LC_ALL, "");
+       (void) bindtextdomain (PACKAGE, LOCALEDIR);
+       (void) textdomain (PACKAGE);
 
        process_flags(argc, argv);
 
@@ -456,7 +456,7 @@ int main (int argc, char **argv)
                        ok = gr_update (&newgr);
                }
 
-               if (!ok) {
+               if (0 == ok) {
                        fprintf (stderr,
                                 _
                                 ("%s: line %d: cannot update group entry\n"),
@@ -473,7 +473,7 @@ int main (int argc, char **argv)
         * changes to be written out all at once, and then unlocked
         * afterwards.
         */
-       if (errors) {
+       if (0 != errors) {
                fprintf (stderr,
                         _("%s: error detected, changes ignored\n"), Prog);
 #ifdef SHADOWGRP