Merge pull request #4282 from yebblies/fixboolx

[cleanup] Turn some more ints into bools
dlang · Jan 12, 2015 · cb117bd · cb117bd
2 parents d02870d + 672b017
commit cb117bd
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 34 deletions.
diff --git a/src/func.c b/src/func.c
@@ -1188,7 +1188,7 @@ void FuncDeclaration::semantic(Scope *sc)
         if (type && mod)
         {
             printedMain = true;
-            const char *name = FileName::searchPath(global.path, mod->srcfile->toChars(), 1);
+            const char *name = FileName::searchPath(global.path, mod->srcfile->toChars(), true);
             fprintf(global.stdmsg, "entry     %-10s\t%s\n", type, name);
         }
     }

diff --git a/src/inifile.c b/src/inifile.c
@@ -88,7 +88,7 @@ const char *findConfFile(const char *argv0, const char *inifile)
     printf("\tPATH='%s'\n", p);
 #endif
     Strings *paths = FileName::splitPath(p);
-    const char *abspath = FileName::searchPath(paths, argv0, 0);
+    const char *abspath = FileName::searchPath(paths, argv0, false);
     if (abspath)
     {
         const char *absname = FileName::replaceName(abspath, inifile);

diff --git a/src/root/filename.c b/src/root/filename.c
@@ -177,7 +177,7 @@ bool FileName::equals(RootObject *obj)
     return compare(obj) == 0;
 }
 
-int FileName::equals(const char *name1, const char *name2)
+bool FileName::equals(const char *name1, const char *name2)
 {
     return compare(name1, name2) == 0;
 }
@@ -186,7 +186,7 @@ int FileName::equals(const char *name1, const char *name2)
  * Return !=0 if absolute path name.
  */
 
-int FileName::absolute(const char *name)
+bool FileName::absolute(const char *name)
 {
 #if _WIN32
     return (*name == '\\') ||
@@ -413,28 +413,28 @@ const char *FileName::forceExt(const char *name, const char *ext)
  * Return !=0 if extensions match.
  */
 
-int FileName::equalsExt(const char *ext)
+bool FileName::equalsExt(const char *ext)
 {
     return equalsExt(str, ext);
 }
 
-int FileName::equalsExt(const char *name, const char *ext)
+bool FileName::equalsExt(const char *name, const char *ext)
 {
     const char *e = FileName::ext(name);
     if (!e && !ext)
-        return 1;
+        return true;
     if (!e || !ext)
-        return 0;
+        return false;
     return FileName::compare(e, ext) == 0;
 }
 
 /*************************************
  * Search Path for file.
  * Input:
- *      cwd     if !=0, search current directory before searching path
+ *      cwd     if true, search current directory before searching path
  */
 
-const char *FileName::searchPath(Strings *path, const char *name, int cwd)
+const char *FileName::searchPath(Strings *path, const char *name, bool cwd)
 {
     if (absolute(name))
     {
@@ -489,7 +489,7 @@ const char *FileName::safeSearchPath(Strings *path, const char *name)
         }
     }
 
-    return FileName::searchPath(path, name, 0);
+    return FileName::searchPath(path, name, false);
 #elif POSIX
     /* Even with realpath(), we must check for // and disallow it
      */
@@ -571,7 +571,7 @@ int FileName::exists(const char *name)
 #endif
 }
 
-int FileName::ensurePathExists(const char *path)
+bool FileName::ensurePathExists(const char *path)
 {
     //printf("FileName::ensurePathExists(%s)\n", path ? path : "");
     if (path && *path)
@@ -589,7 +589,7 @@ int FileName::ensurePathExists(const char *path)
                     return 0;
                 }
 #endif
-                int r = ensurePathExists(p);
+                bool r = ensurePathExists(p);
                 mem.free((void *)p);
                 if (r)
                     return r;
@@ -614,12 +614,12 @@ int FileName::ensurePathExists(const char *path)
                      * this directory
                      */
                     if (errno != EEXIST)
-                        return 1;
+                        return true;
                 }
             }
         }
     }
-    return 0;
+    return false;
 }
 
 /******************************************

diff --git a/src/root/filename.h b/src/root/filename.h
@@ -26,10 +26,10 @@ struct FileName
     const char *str;
     FileName(const char *str);
     bool equals(RootObject *obj);
-    static int equals(const char *name1, const char *name2);
+    static bool equals(const char *name1, const char *name2);
     int compare(RootObject *obj);
     static int compare(const char *name1, const char *name2);
-    static int absolute(const char *name);
+    static bool absolute(const char *name);
     static const char *ext(const char *);
     const char *ext();
     static const char *removeExt(const char *str);
@@ -42,14 +42,14 @@ struct FileName
     static Strings *splitPath(const char *path);
     static const char *defaultExt(const char *name, const char *ext);
     static const char *forceExt(const char *name, const char *ext);
-    static int equalsExt(const char *name, const char *ext);
+    static bool equalsExt(const char *name, const char *ext);
 
-    int equalsExt(const char *ext);
+    bool equalsExt(const char *ext);
 
-    static const char *searchPath(Strings *path, const char *name, int cwd);
+    static const char *searchPath(Strings *path, const char *name, bool cwd);
     static const char *safeSearchPath(Strings *path, const char *name);
     static int exists(const char *name);
-    static int ensurePathExists(const char *path);
+    static bool ensurePathExists(const char *path);
     static const char *canonicalName(const char *name);
 
     static void free(const char *str);

diff --git a/src/template.c b/src/template.c
@@ -94,7 +94,7 @@ Parameter *isParameter(RootObject *o)
 /**************************************
  * Is this Object an error?
  */
-int isError(RootObject *o)
+bool isError(RootObject *o)
 {
     Type *t = isType(o);
     if (t)
@@ -108,22 +108,22 @@ int isError(RootObject *o)
     Dsymbol *s = isDsymbol(o);
     assert(s);
     if (s->errors)
-        return 1;
-    return s->parent ? isError(s->parent) : 0;
+        return true;
+    return s->parent ? isError(s->parent) : false;
 }
 
 /**************************************
  * Are any of the Objects an error?
  */
-int arrayObjectIsError(Objects *args)
+bool arrayObjectIsError(Objects *args)
 {
     for (size_t i = 0; i < args->dim; i++)
     {
         RootObject *o = (*args)[i];
         if (isError(o))
-            return 1;
+            return true;
     }
-    return 0;
+    return false;
 }
 
 /***********************
@@ -263,11 +263,11 @@ bool definitelyValueParameter(Expression *e)
 }
 
 /******************************
- * If o1 matches o2, return 1.
- * Else, return 0.
+ * If o1 matches o2, return true.
+ * Else, return false.
  */
 
-int match(RootObject *o1, RootObject *o2)
+bool match(RootObject *o1, RootObject *o2)
 {
     Type *t1 = isType(o1);
     Type *t2 = isType(o2);
@@ -334,11 +334,11 @@ int match(RootObject *o1, RootObject *o2)
             goto Lnomatch;
     }
     //printf("match\n");
-    return 1;   // match
+    return true;   // match
 
 Lnomatch:
     //printf("nomatch\n");
-    return 0;   // nomatch;
+    return false;   // nomatch;
 }
 
 

diff --git a/src/template.h b/src/template.h
@@ -392,8 +392,8 @@ Dsymbol *isDsymbol(RootObject *o);
 Type *isType(RootObject *o);
 Tuple *isTuple(RootObject *o);
 Parameter *isParameter(RootObject *o);
-int arrayObjectIsError(Objects *args);
-int isError(RootObject *o);
+bool arrayObjectIsError(Objects *args);
+bool isError(RootObject *o);
 Type *getType(RootObject *o);
 Dsymbol *getDsymbol(RootObject *o);