d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use strtoimax.

Browse Source 
Use existing strtoimax instead of reinventing it
This commit is contained in:
bapt 2019-12-17 09:13:48 +00:00
parent df06246063
commit ba4bc69258
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.bin/diff3/diff3.c
View File

@ -84,6 +84,8 @@ __FBSDID("$FreeBSD$");
#include <getopt.h>
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
#include <inttypes.h>
#include <string.h>
#include <unistd.h>
@ -132,7 +134,6 @@ static bool duplicate(struct range *, struct range *);
static int edit(struct diff *, bool, int);
static char *getchange(FILE *);
static char *get_line(FILE *, size_t *);
static int number(char **);
static int readin(int fd, struct diff **);
static int skip(int, int, const char *);
static void change(int, struct range *, bool);
@ -188,16 +189,16 @@ readin(int fd, struct diff **dd)
for (i=0; (p = getchange(f)); i++) {
if (i >= szchanges - 1)
increase();
a = b = number(&p);
a = b = (int)strtoimax(p, &p, 10);
if (*p == ',') {
p++;
b = number(&p);
b = (int)strtoimax(p, &p, 10);
}
kind = *p++;
c = d = number(&p);
c = d = (int)strtoimax(p, &p, 10);
if (*p==',') {
p++;
d = number(&p);
d = (int)strtoimax(p, &p, 10);
}
if (kind == 'a')
a++;
@ -240,17 +241,6 @@ diffexec(const char *diffprog, char **diffargv, int fd[])
return (pd);
}
static int
number(char **lc)
{
int nn;
nn = 0;
while (isdigit((unsigned char)(**lc)))
nn = nn*10 + *(*lc)++ - '0';
return (nn);
}
static char *
getchange(FILE *b)
{