Switch variables from int to bool where appropriate

dpkg-deb/build.c

@@ -211,11 +211,12 @@ void do_build(const char *const *argv) {
   
   char *m;
   const char *debar, *directory, *const *mscriptp, *versionstring, *arch;
+  bool subdir;
   char *controlfile, *tfbuf;
   struct pkginfo *checkedinfo;
   struct arbitraryfield *field;
   FILE *ar, *cf;
-  int p1[2], p2[2], p3[2], warns, n, c, subdir, gzfd;
+  int p1[2], p2[2], p3[2], warns, n, c, gzfd;
   pid_t c1,c2,c3;
   struct stat controlstab, mscriptstab, debarstab;
   char conffilename[MAXCONFFILENAME+1];
@@ -227,7 +228,7 @@ void do_build(const char *const *argv) {
   directory = *argv++;
   if (!directory)
     badusage(_("--%s needs a <directory> argument"), cipaction->olong);
-  subdir= 0;
+  subdir = false;
   debar = *argv++;
   if (debar != NULL) {
     if (*argv) badusage(_("--build takes at most two arguments"));
@@ -236,7 +237,7 @@ void do_build(const char *const *argv) {
         if (errno != ENOENT)
           ohshite(_("unable to check for existence of archive `%.250s'"),debar);
       } else if (S_ISDIR(debarstab.st_mode)) {
-        subdir= 1;
+        subdir = true;
       }
     }
   } else {

lib/dpkg/pkg-format.c

@@ -207,10 +207,10 @@ pkg_format_show(const struct pkg_format_node *head,
 	struct varbuf vb = VARBUF_INIT, fb = VARBUF_INIT, wb = VARBUF_INIT;
 
 	while (head) {
-		int ok;
+		bool ok;
 		char fmt[16];
 
-		ok = 0;
+		ok = false;
 
 		if (head->width > 0)
 			snprintf(fmt, 16, "%%%s%zds",
@@ -220,7 +220,7 @@ pkg_format_show(const struct pkg_format_node *head,
 
 		if (head->type == string) {
 			varbufprintf(&fb, fmt, head->data);
-			ok = 1;
+			ok = true;
 		} else if (head->type == field) {
 			const struct fieldinfo *fip;
 
@@ -231,7 +231,7 @@ pkg_format_show(const struct pkg_format_node *head,
 					varbufaddc(&wb, '\0');
 					varbufprintf(&fb, fmt, wb.buf);
 					varbufreset(&wb);
-					ok = 1;
+					ok = true;
 					break;
 				}
 
@@ -241,7 +241,7 @@ pkg_format_show(const struct pkg_format_node *head,
 				for (afp = pif->arbs; afp; afp = afp->next)
 					if (strcasecmp(head->data, afp->name) == 0) {
 						varbufprintf(&fb, fmt, afp->value);
-						ok = 1;
+						ok = true;
 						break;
 					}
 			}

src/errors.c

@@ -65,7 +65,7 @@ void print_error_perpackage(const char *emsg, const char *arg) {
   nr= malloc(sizeof(struct error_report));
   if (!nr) {
     perror(_("dpkg: failed to allocate memory for new entry in list of failed packages."));
-    abort_processing = 1;
+    abort_processing = true;
     nr= &emergency;
   }
   nr->what= arg;
@@ -75,7 +75,7 @@ void print_error_perpackage(const char *emsg, const char *arg) {
     
   if (nerrs++ < errabort) return;
   fprintf(stderr, _("dpkg: too many errors, stopping\n"));
-  abort_processing = 1;
+  abort_processing = true;
 }
 
 int reportbroken_retexitstatus(void) {

src/main.c

@@ -608,7 +608,8 @@ void commandfd(const char *const *argv) {
   }
 
   for (;;) {
-    int argc= 1, mode= 0;
+    bool mode = false;
+    int argc= 1;
     lno= 0;
     push_error_handler(&ejbuf, print_error_fatal, NULL);
 
@@ -642,15 +643,15 @@ void commandfd(const char *const *argv) {
 	skipchar = true;
 	continue;
       } else if (isspace(*ptr)) {
-	if (mode == 1) {
+	if (mode == true) {
 	  *ptr = '\0';
-	  mode= 0;
+	  mode = false;
 	}
       } else {
-	if (mode == 0) {
+	if (mode == false) {
 	  newargs[argc]= ptr;
 	  argc++;
-	  mode= 1;
+	  mode = true;
 	}
       }
       ptr++;

src/packages.c

@@ -306,7 +306,7 @@ static int deppossi_ok_found(struct pkginfo *possdependee,
                              struct pkginfo *removing,
                              struct pkginfo *providing,
                              struct pkginfo **fixbytrig,
-                             int *matched,
+                             bool *matched,
                              struct deppossi *checkversion,
                              int *interestingwarnings,
                              struct varbuf *oemsgs) {
@@ -327,7 +327,7 @@ static int deppossi_ok_found(struct pkginfo *possdependee,
 		   possdependee->name);
     }
 
-    *matched= 1;
+    *matched = true;
     if (fc_depends) thisf= (dependtry >= 4) ? 2 : 1;
     debug(dbg_depcondetail,"      removing possdependee, returning %d",thisf);
     return thisf;
@@ -510,7 +510,8 @@ int breakses_ok(struct pkginfo *pkg, struct varbuf *aemsgs) {
 
 int dependencies_ok(struct pkginfo *pkg, struct pkginfo *removing,
                     struct varbuf *aemsgs) {
-  int ok, matched, found, thisf, interestingwarnings, anycannotfixbytrig;
+  int ok, found, thisf, interestingwarnings;
+  bool matched, anycannotfixbytrig;
   struct varbuf oemsgs = VARBUF_INIT;
   struct dependency *dep;
   struct deppossi *possi, *provider;
@@ -521,12 +522,13 @@ int dependencies_ok(struct pkginfo *pkg, struct pkginfo *removing,
   debug(dbg_depcon,"checking dependencies of %s (- %s)",
         pkg->name, removing ? removing->name : "<none>");
 
-  anycannotfixbytrig = 0;
+  anycannotfixbytrig = false;
   canfixbytrig = NULL;
   for (dep= pkg->installed.depends; dep; dep= dep->next) {
     if (dep->type != dep_depends && dep->type != dep_predepends) continue;
     debug(dbg_depcondetail,"  checking group ...");
-    matched= 0; varbufreset(&oemsgs);
+    matched = false;
+    varbufreset(&oemsgs);
     found= 0; /* 0=none, 1=defer, 2=withwarning, 3=ok */
     possfixbytrig = NULL;
     for (possi= dep->list; found != 3 && possi; possi= possi->next) {
@@ -562,7 +564,7 @@ int dependencies_ok(struct pkginfo *pkg, struct pkginfo *removing,
     if (removing && !matched) continue;
     switch (found) {
     case 0:
-      anycannotfixbytrig = 1;
+      anycannotfixbytrig = true;
       ok= 0;
     case 2:
       varbufaddstr(aemsgs, " ");
@@ -584,7 +586,7 @@ int dependencies_ok(struct pkginfo *pkg, struct pkginfo *removing,
       if (possfixbytrig)
         canfixbytrig = possfixbytrig;
       else
-        anycannotfixbytrig = 1;
+        anycannotfixbytrig = true;
       if (ok>1) ok= 1;
       break;
     case 3: