pogmommy/nmrpflash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Further simplifications

Browse source
This commit is contained in:
Joseph C. Lehner 2017-01-07 08:15:42 +01:00
parent 1cfd98fb27
commit 0a2eb2a8c9
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tftp.c
View file

@ -84,9 +84,10 @@ static bool pkt_nextstr(char **pkt, char **str, size_t *rem)
if (!isprint(**pkt) || !(len = strnlen(*pkt, *rem))) { if (!isprint(**pkt) || !(len = strnlen(*pkt, *rem))) {
return false; return false;
} else if (str) {
*str = *pkt;
} }
*str = *pkt;
*pkt += len + 1; *pkt += len + 1;
if (*rem > 1) { if (*rem > 1) {
@ -120,16 +121,14 @@ static char *pkt_optval(char* pkt, const char* name)
static size_t pkt_xrqlen(char *pkt) static size_t pkt_xrqlen(char *pkt)
{ {
size_t len = 2, rem = 512; size_t rem = 512;
char *opt, *val;
pkt += 2; pkt += 2;
while (pkt_nextopt(&pkt, NULL, NULL, &rem)) {
while (pkt_nextopt(&pkt, &opt, &val, &rem)) { ;
len += strlen(opt) + strlen(val) + 2;
} }
return len; return 514 - rem;
} }
static void pkt_mkwrq(char *pkt, const char *filename, unsigned blksize) static void pkt_mkwrq(char *pkt, const char *filename, unsigned blksize)