pathpath: remove 'a' parameter

This function is only ever called with a=="". There is probably more
simplification possible within pathpath, but the logic is convoluted. Better to
unwind this mess in a separate commit.

diff --git a/lib/ast/ast.h b/lib/ast/ast.h
index 34ff8c9ef8a71d6d5ba0417c356be155cfeeb6a3..a4bd5df79c1ac0306644c8ea4c8835b6f247625f 100644 (file)
--- a/lib/ast/ast.h
+++ b/lib/ast/ast.h
@@ -63,7 +63,7 @@ extern "C" {
 #define strneq(a,b,n)     (!strncmp(a,b,n))
 #define memzero(b,n)    memset(b,0,n)
 
-    extern char *pathpath(char *, const char *, const char *);
+    extern char *pathpath(char *, const char *);
     extern char *pathfind(const char *, const char *, const char *, char *,
                          size_t);
     extern char *pathaccess(char *, const char *, const char *,

diff --git a/lib/ast/pathfind.c b/lib/ast/pathfind.c
index fe09f3e66de8c184433e37996000aa88a8dc5334..7511835a8bf58b45e65546f0da5f7b5c152f4645 100644 (file)
--- a/lib/ast/pathfind.c
+++ b/lib/ast/pathfind.c
@@ -65,12 +65,12 @@ char *pathfind(const char *name, const char *lib, const char *type,
            type = 0;
        for (dp = state.head; dp; dp = dp->next) {
            snprintf(tmp, sizeof(tmp), "%s/%s", dp->dir, name);
-           if (pathpath(buf, tmp, ""))
+           if (pathpath(buf, tmp))
                return buf;
            if (type) {
                snprintf(tmp, sizeof(tmp), "%s/%s.%s", dp->dir, name,
                          type);
-               if (pathpath(buf, tmp, ""))
+               if (pathpath(buf, tmp))
                    return buf;
            }
        }
@@ -78,12 +78,12 @@ char *pathfind(const char *name, const char *lib, const char *type,
            if ((s = strrchr(lib, ':')))
                lib = (const char *) s + 1;
            snprintf(tmp, sizeof(tmp), "lib/%s/%s", lib, name);
-           if (pathpath(buf, tmp, ""))
+           if (pathpath(buf, tmp))
                return buf;
            if (type) {
                snprintf(tmp, sizeof(tmp), "lib/%s/%s.%s", lib, name,
                          type);
-               if (pathpath(buf, tmp, ""))
+               if (pathpath(buf, tmp))
                    return buf;
            }
        }

diff --git a/lib/ast/pathpath.c b/lib/ast/pathpath.c
index 9a19552a5f833851036481a927c06600caca117c..b3790a871e252e1f2b8abd70c3671d2aa9027703 100644 (file)
--- a/lib/ast/pathpath.c
+++ b/lib/ast/pathpath.c
@@ -41,8 +41,9 @@ static const char *getenv_path(void) {
 
 char **opt_info_argv;
 
-char *pathpath(char *path, const char *p, const char *a)
+char *pathpath(char *path, const char *p)
 {
+    const char *a = "";
     char *s;
     const char *x;
     char buf[PATH_MAX];