diff options
| author | jtc <jtc@NetBSD.org> | 1993-09-29 21:37:02 +0000 |
|---|---|---|
| committer | jtc <jtc@NetBSD.org> | 1993-09-29 21:37:02 +0000 |
| commit | ac21a0e171d9b7161e91467775af3b7213ad7502 (patch) | |
| tree | 629d6f045c9baf006133cbb7dab9a6668f793c3e /gnu/usr.bin/diff/diff3.c | |
| parent | 81c776a8e40880f27728682bf653ff4d15da1ef7 (diff) | |
Upgrade to GNU Diffutils 2.5.
No user visable changes, I just want to keep things in sync to make sure
that integrating future versions of diffutils will continue to be relatively
painless.
Diffstat (limited to 'gnu/usr.bin/diff/diff3.c')
| -rw-r--r-- | gnu/usr.bin/diff/diff3.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/usr.bin/diff/diff3.c b/gnu/usr.bin/diff/diff3.c index aef680ab1c3..fe27ef2f1cb 100644 --- a/gnu/usr.bin/diff/diff3.c +++ b/gnu/usr.bin/diff/diff3.c @@ -18,13 +18,13 @@ /* Written by Randy Smith */ #ifndef lint -static char *rcsid = "$Id: diff3.c,v 1.3 1993/09/16 17:39:10 jtc Exp $"; +static char *rcsid = "$Id: diff3.c,v 1.4 1993/09/29 21:37:07 jtc Exp $"; #endif +#include "system.h" #include <stdio.h> #include <ctype.h> #include "getopt.h" -#include "system.h" extern char const version_string[]; @@ -179,7 +179,7 @@ static int merge; static char *argv0; -VOID *xmalloc PARAMS((size_t)); +static VOID *xmalloc PARAMS((size_t)); static VOID *xrealloc PARAMS((VOID *, size_t)); static char *read_diff PARAMS((char const *, char const *, char **)); @@ -1032,9 +1032,9 @@ process_diff_control (string, db) #define SKIPWHITE(s) { while (*s == ' ' || *s == '\t') s++; } #define READNUM(s, num) \ - { if (!isdigit (*s)) return ERROR; holdnum = 0; \ - do { holdnum = (*s++ - '0' + holdnum * 10); } \ - while (isdigit (*s)); (num) = holdnum; } + { unsigned char c = *s; if (!isdigit (c)) return ERROR; holdnum = 0; \ + do { holdnum = (c - '0' + holdnum * 10); } \ + while (isdigit (c = *++s)); (num) = holdnum; } /* Read first set of digits */ SKIPWHITE (s); @@ -1658,7 +1658,7 @@ myread (fd, ptr, size) return result; } -VOID * +static VOID * xmalloc (size) size_t size; { |
