emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- do not use non-standard u_int.

Browse Source 
- do not use _PATH_DEVNULL gnuism but bb_dev_null.
Thanks to Rich Felker.
This commit is contained in:
Bernhard Reutner-Fischer 2006-05-19 13:02:27 +00:00
parent e2922e42a0
commit 14aa06f29c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
coreutils/diff.c
View File

@ -8,7 +8,7 @@
* Sponsored in part by the Defense Advanced Research Projects * Sponsored in part by the Defense Advanced Research Projects
* Agency (DARPA) and Air Force Research Laboratory, Air Force * Agency (DARPA) and Air Force Research Laboratory, Air Force
* Materiel Command, USAF, under agreement number F39502-99-1-0512. * Materiel Command, USAF, under agreement number F39502-99-1-0512.
* *
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * 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 i, k, y, j, l;
int oldc, tc, oldl; int oldc, tc, oldl;
u_int numtries; unsigned int numtries;
#if ENABLE_FEATURE_DIFF_MINIMAL #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 #else
const u_int bound = MAX(256, isqrt(n)); const unsigned int bound = MAX(256, isqrt(n));
#endif #endif
k = 0; k = 0;
c[0] = newcand(0, 0, 0); c[0] = newcand(0, 0, 0);
@ -933,7 +933,7 @@ static int diffreg(char *ofile1, char *ofile2, int flags)
goto closem; goto closem;
if (flags & D_EMPTY1) if (flags & D_EMPTY1)
f1 = bb_xfopen(_PATH_DEVNULL, "r"); f1 = bb_xfopen(bb_dev_null, "r");
else { else {
if (strcmp(file1, "-") == 0) if (strcmp(file1, "-") == 0)
f1 = stdin; f1 = stdin;
@ -942,7 +942,7 @@ static int diffreg(char *ofile1, char *ofile2, int flags)
} }
if (flags & D_EMPTY2) if (flags & D_EMPTY2)
f2 = bb_xfopen(_PATH_DEVNULL, "r"); f2 = bb_xfopen(bb_dev_null, "r");
else { else {
if (strcmp(file2, "-") == 0) if (strcmp(file2, "-") == 0)
f2 = stdin; f2 = stdin;