empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(parseid): New, factored out of recvline() and recv_output().

Browse source 
(recvline, recv_output): Use it.
This commit is contained in:
Markus Armbruster 2007-12-14 07:44:12 +00:00
parent c9c9305c2f
commit 225f0f5132
3 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/client/expect.c
View file

@ -58,10 +58,9 @@ int
recvline(int s, char *buf)
{
int sz = 1024;
char *bp, *end;
char *bp;
char ch;
ssize_t n;
long id;
bp = buf;
for (;;) {
@ -84,10 +83,18 @@ recvline(int s, char *buf)
*bp++ = ch;
*bp = 0;
return parseid(buf);
}
id = strtol(buf, &end, 16);
if (end == buf || *end != ' ') {
fprintf(stderr, "Malformed id in line %s", buf);
int
parseid(char *line)
{
char *end;
long id;
id = strtol(line, &end, 16);
if (end == line || *end != ' ') {
fprintf(stderr, "Malformed id in line %s", line);
id = -1;
}
if (id > C_LAST)