svn commit: trunk/busybox/archival

vodz at busybox.net vodz at busybox.net
Tue Dec 6 12:21:04 UTC 2005


Author: vodz
Date: 2005-12-06 04:20:57 -0800 (Tue, 06 Dec 2005)
New Revision: 12691

Log:
reduce 3 warning if compile with -W

Modified:
   trunk/busybox/archival/tar.c


Changeset:
Modified: trunk/busybox/archival/tar.c
===================================================================
--- trunk/busybox/archival/tar.c	2005-12-06 12:00:39 UTC (rev 12690)
+++ trunk/busybox/archival/tar.c	2005-12-06 12:20:57 UTC (rev 12691)
@@ -322,6 +322,8 @@
 
 	return 0;
 }
+# else
+#define exclude_file(excluded_files, file) 0
 # endif
 
 static int writeFileToTarball(const char *fileName, struct stat *statbuf,
@@ -449,6 +451,7 @@
 			/* Avoid vfork clobbering */
 			(void) &include;
 			(void) &errorFlag;
+			(void) &zip_exec;
 # endif
 
 		gzipPid = vfork();
@@ -463,7 +466,7 @@
 			close(gzipStatusPipe[0]);
 			fcntl(gzipStatusPipe[1], F_SETFD, FD_CLOEXEC);	/* close on exec shows sucess */
 
-			execlp(zip_exec, zip_exec, "-f", 0);
+			execlp(zip_exec, zip_exec, "-f", NULL);
 			vfork_exec_errno = errno;
 
 			close(gzipStatusPipe[1]);
@@ -479,7 +482,7 @@
 
 				if (n == 0 && vfork_exec_errno != 0) {
 					errno = vfork_exec_errno;
-					bb_perror_msg_and_die("Could not exec %s",zip_exec);
+					bb_perror_msg_and_die("Could not exec %s", zip_exec);
 				} else if ((n < 0) && (errno == EAGAIN || errno == EINTR))
 					continue;	/* try it again */
 				break;




More information about the busybox-cvs mailing list