aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-19 13:02:27 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-19 13:02:27 +0000
commit14aa06f29c22797bf8bf054afc25a6ef71718734 (patch)
tree0beba195743109b995cd407bec53e7eb2b010cc5 /coreutils
parente2922e42a00b3d247368a2c1f32740771aaae0cb (diff)
downloadbusybox-14aa06f29c22797bf8bf054afc25a6ef71718734.tar.gz
- do not use non-standard u_int.
- do not use _PATH_DEVNULL gnuism but bb_dev_null. Thanks to Rich Felker.
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/diff.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/coreutils/diff.c b/coreutils/diff.c
index 92cf35b0a..c9274e64f 100644
--- a/coreutils/diff.c
+++ b/coreutils/diff.c
@@ -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 @@ static int stone(int *a, int n, int *b, int *c)
{
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 @@ static int diffreg(char *ofile1, char *ofile2, int flags)
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 @@ static int diffreg(char *ofile1, char *ofile2, int flags)
}
if (flags & D_EMPTY2)
- f2 = bb_xfopen(_PATH_DEVNULL, "r");
+ f2 = bb_xfopen(bb_dev_null, "r");
else {
if (strcmp(file2, "-") == 0)
f2 = stdin;