shithub: scc

Info  •  Files  •  Log  •  Branches

[nm] Remove fname from object() parameters

--- a/nm/main.c

+++ b/nm/main.c

@@ -87,7 +87,7 @@

 		pos += siz;

 		getfname(&hdr, member);

-		if (object(fname, fp)) {

+		if (object(fp)) {

 			nm(fname, hdr.ar_name, fp);

 		} else {

 			fprintf(stderr,

@@ -154,7 +154,7 @@

 		exit(1);

 	}

-	if (object(fname, fp))

+	if (object(fp))

 		nm(fname, fname, fp);

 	else if (archive(fname, fp))

 		ar(fname, fp);

--- a/nm/myro.c

+++ b/nm/myro.c

@@ -125,7 +125,7 @@

 }

 int

-object(char *fname, FILE *fp)

+object(FILE *fp)

 {

 	char magic[MYROMAGIC_SIZ];

 	fpos_t pos;

--- a/nm/nm.h

+++ b/nm/nm.h

@@ -11,7 +11,7 @@

 /* object format file */

 extern void nm(char *fname, char *member, FILE *fp);

-extern int object(char *fname, FILE *fp);

+extern int object(FILE *fp);

 extern int radix;

 extern int Pflag;