Changeset 3827

Timestamp:

Feb 28, 2014, 1:01:49 AM (12 years ago)

Author:

bird

Message:

the -aa option fixed these initialization issues.

Location:

trunk/libc/src/fbsdlibc/gen

Files:

• ftw.c (modified) (1 diff)
• nftw.c (modified) (1 diff)

trunk/libc/src/fbsdlibc/gen/ftw.c

@@ -42 +42 @@
     int nfds)
 {
+        char * const paths[2] = { (char *)path, NULL };
         FTSENT *cur;
         FTS *ftsp;
         int error = 0, fnflag, sverrno;
-        char *paths[2]; /* bird: watcom says "E1054: Expression must be constant" to the original initializer. */
-        paths[0] = (char *)path;
-        paths[1] = NULL;
 
         /* XXX - nfds is currently unused */

trunk/libc/src/fbsdlibc/gen/nftw.c

@@ -46 +46 @@
         FTS *ftsp;
         int error = 0, ftsflags, fnflag, postorder, sverrno;
-#if 0 /* bird watcom says: Error! E1054: Expression must be constant */
         char * const paths[2] = { (char *)path, NULL };
-#else
-        char *paths[2];
-        paths[0] = (char *)path;
-        paths[1] = NULL;
-#endif
 
         /* XXX - nfds is currently unused */