shithub: scc

Info  •  Files  •  Log  •  Branches

[ar] Remove parameter of doit()

The call to openar() can be done in doit().

--- a/ar/main.c

+++ b/ar/main.c

@@ -508,10 +508,11 @@

 }

 static void

-doit(int key, FILE *fp, char *flist[])

+doit(int key, char *flist[])

 {

-	FILE *tmp1, *tmp2;

+	FILE *tmp1, *tmp2, *fp;

+	fp = openar();

 	if (*flist == NULL &&

 	    (key == 'r' || key == 'd' || key == 'm' || key == 'q')) {

 		if (fclose(fp) == EOF) {

@@ -650,7 +651,7 @@

 	signal(SIGTERM, sigfun);

 	arfile = *argv;

-	doit(key, openar(), argv+1);

+	doit(key, argv+1);

 	if (fflush(stdout) == EOF) {

 		perror("ar:error writing to stdout");