svn commit: trunk/busybox/coreutils

[aldot at busybox.net]

Author: aldot
Date: 2006-12-13 08:50:15 -0800 (Wed, 13 Dec 2006)
New Revision: 16898

Log:
- remove warning about unused depth parameter in add_to_dirlist()
- make one variable static and add comment about why the other variables there are not static.


Modified:
   trunk/busybox/coreutils/diff.c


Changeset:
Modified: trunk/busybox/coreutils/diff.c
===================================================================
--- trunk/busybox/coreutils/diff.c	2006-12-13 13:17:18 UTC (rev 16897)
+++ trunk/busybox/coreutils/diff.c	2006-12-13 16:50:15 UTC (rev 16898)
@@ -67,11 +67,13 @@
 #define FLAG_U	(1<<12)
 #define	FLAG_w	(1<<13)
 
+/* XXX: FIXME: the following variables should be static, but gcc currently
+ * creates a much bigger object if we do this.  */
 int context, status;
 char *start, *label[2];
 struct stat stb1, stb2;
 char **dl;
-int dl_count = 0;
+static int dl_count = 0;
 
 struct cand {
 	int x;
@@ -1030,7 +1032,8 @@
 /* This function adds a filename to dl, the directory listing. */
 
 static int add_to_dirlist(const char *filename,
-		struct stat ATTRIBUTE_UNUSED * sb, void *userdata, int depth)
+		struct stat ATTRIBUTE_UNUSED * sb, void *userdata,
+		int depth ATTRIBUTE_UNUSED)
 {
 	dl_count++;
 	dl = xrealloc(dl, dl_count * sizeof(char *));