Bug 699691 - Remove an unused argument from ino2name in pathsub.{c,h}. r=ted
authorJeff Walden <jwalden@mit.edu>
Fri, 04 Nov 2011 18:36:40 -0700
changeset 79978 be3714af78693189db5a20aef3715fb5ddfd6a88
parent 79977 6b2d55b83aa954172450ab4bab67499832a3b504
child 79979 a15e40c515ebc844c09baaa14825741262a15453
push idunknown
push userunknown
push dateunknown
reviewersted
bugs699691
milestone10.0a1
Bug 699691 - Remove an unused argument from ino2name in pathsub.{c,h}. r=ted
config/pathsub.c
config/pathsub.h
js/src/config/pathsub.c
js/src/config/pathsub.h
--- a/config/pathsub.c
+++ b/config/pathsub.c
@@ -123,17 +123,17 @@ struct dirent *readdir(DIR *d)
 
         if(buf == NULL)
                 buf = (struct dirent *) malloc(sizeof(struct dirent) + MAXPATHLEN);
         return(readdir_r(d, buf));
 }
 #endif
 
 char *
-ino2name(ino_t ino, char *dir)
+ino2name(ino_t ino)
 {
     DIR *dp;
     struct dirent *ep;
     char *name;
 
     dp = opendir("..");
     if (!dp)
 	fail("cannot read parent directory");
@@ -225,17 +225,17 @@ reversepath(char *inpath, char *name, in
     cp = strcpy(outpath + PATH_MAX - (len + 1), name);
     cp2 = inpath;
     while ((cp2 = getcomponent(cp2, buf)) != 0) {
 	if (strcmp(buf, ".") == 0)
 	    continue;
 	if (strcmp(buf, "..") == 0) {
 	    if (stat(".", &sb) < 0)
 		fail("cannot stat current directory");
-	    name = ino2name(sb.st_ino, "..");
+	    name = ino2name(sb.st_ino);
 	    len = strlen(name);
 	    cp -= len + 1;
 	    strcpy(cp, name);
 	    cp[len] = '/';
 	    free(name);
 	    xchdir("..");
 	} else {
 	    cp -= 3;
--- a/config/pathsub.h
+++ b/config/pathsub.h
@@ -54,17 +54,17 @@
  */
 #undef NAME_MAX
 #define NAME_MAX 256
 
 extern char *program;
 
 extern void fail(char *format, ...);
 extern char *getcomponent(char *path, char *name);
-extern char *ino2name(ino_t ino, char *dir);
+extern char *ino2name(ino_t ino);
 extern void *xmalloc(size_t size);
 extern char *xstrdup(char *s);
 extern char *xbasename(char *path);
 extern void xchdir(char *dir);
 
 /* Relate absolute pathnames from and to returning the result in outpath. */
 extern int relatepaths(char *from, char *to, char *outpath);
 
--- a/js/src/config/pathsub.c
+++ b/js/src/config/pathsub.c
@@ -123,17 +123,17 @@ struct dirent *readdir(DIR *d)
 
         if(buf == NULL)
                 buf = (struct dirent *) malloc(sizeof(struct dirent) + MAXPATHLEN);
         return(readdir_r(d, buf));
 }
 #endif
 
 char *
-ino2name(ino_t ino, char *dir)
+ino2name(ino_t ino)
 {
     DIR *dp;
     struct dirent *ep;
     char *name;
 
     dp = opendir("..");
     if (!dp)
 	fail("cannot read parent directory");
@@ -225,17 +225,17 @@ reversepath(char *inpath, char *name, in
     cp = strcpy(outpath + PATH_MAX - (len + 1), name);
     cp2 = inpath;
     while ((cp2 = getcomponent(cp2, buf)) != 0) {
 	if (strcmp(buf, ".") == 0)
 	    continue;
 	if (strcmp(buf, "..") == 0) {
 	    if (stat(".", &sb) < 0)
 		fail("cannot stat current directory");
-	    name = ino2name(sb.st_ino, "..");
+	    name = ino2name(sb.st_ino);
 	    len = strlen(name);
 	    cp -= len + 1;
 	    strcpy(cp, name);
 	    cp[len] = '/';
 	    free(name);
 	    xchdir("..");
 	} else {
 	    cp -= 3;
--- a/js/src/config/pathsub.h
+++ b/js/src/config/pathsub.h
@@ -54,17 +54,17 @@
  */
 #undef NAME_MAX
 #define NAME_MAX 256
 
 extern char *program;
 
 extern void fail(char *format, ...);
 extern char *getcomponent(char *path, char *name);
-extern char *ino2name(ino_t ino, char *dir);
+extern char *ino2name(ino_t ino);
 extern void *xmalloc(size_t size);
 extern char *xstrdup(char *s);
 extern char *xbasename(char *path);
 extern void xchdir(char *dir);
 
 /* Relate absolute pathnames from and to returning the result in outpath. */
 extern int relatepaths(char *from, char *to, char *outpath);