svn commit: trunk/busybox/coreutils
aldot at busybox.net
aldot at busybox.net
Fri May 19 13:02:44 UTC 2006
Author: aldot
Date: 2006-05-19 06:02:27 -0700 (Fri, 19 May 2006)
New Revision: 15132
Log:
- do not use non-standard u_int.
- do not use _PATH_DEVNULL gnuism but bb_dev_null.
Thanks to Rich Felker.
Modified:
trunk/busybox/coreutils/diff.c
Changeset:
Modified: trunk/busybox/coreutils/diff.c
===================================================================
--- trunk/busybox/coreutils/diff.c 2006-05-19 12:48:56 UTC (rev 15131)
+++ trunk/busybox/coreutils/diff.c 2006-05-19 13:02:27 UTC (rev 15132)
@@ -8,7 +8,7 @@
* Sponsored in part by the Defense Advanced Research Projects
* Agency (DARPA) and Air Force Research Laboratory, Air Force
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
- *
+ *
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
@@ -405,11 +405,11 @@
{
int i, k, y, j, l;
int oldc, tc, oldl;
- u_int numtries;
+ unsigned int numtries;
#if ENABLE_FEATURE_DIFF_MINIMAL
- const u_int bound = (cmd_flags & FLAG_d) ? UINT_MAX : MAX(256, isqrt(n));
+ const unsigned int bound = (cmd_flags & FLAG_d) ? UINT_MAX : MAX(256, isqrt(n));
#else
- const u_int bound = MAX(256, isqrt(n));
+ const unsigned int bound = MAX(256, isqrt(n));
#endif
k = 0;
c[0] = newcand(0, 0, 0);
@@ -933,7 +933,7 @@
goto closem;
if (flags & D_EMPTY1)
- f1 = bb_xfopen(_PATH_DEVNULL, "r");
+ f1 = bb_xfopen(bb_dev_null, "r");
else {
if (strcmp(file1, "-") == 0)
f1 = stdin;
@@ -942,7 +942,7 @@
}
if (flags & D_EMPTY2)
- f2 = bb_xfopen(_PATH_DEVNULL, "r");
+ f2 = bb_xfopen(bb_dev_null, "r");
else {
if (strcmp(file2, "-") == 0)
f2 = stdin;
More information about the busybox-cvs
mailing list