diff options
| author | Tim Angus <tim@ngus.net> | 2009-10-26 00:10:07 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:05 +0000 |
| commit | 0fed3b1c32d99560482ea162b197531439df76e5 (patch) | |
| tree | dd5f74d3124715a538462aa474f9af294f79bbbd /src/tools | |
| parent | af6fd4fa5aaa4dc7c59ae54ead20d5ef0fbcc946 (diff) | |
* Merge ioq3-r1708
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/lcc/cpp/include.c | 8 | ||||
| -rw-r--r-- | src/tools/lcc/cpp/tokens.c | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/tools/lcc/cpp/include.c b/src/tools/lcc/cpp/include.c index 1bb88475..331a0b4f 100644 --- a/src/tools/lcc/cpp/include.c +++ b/src/tools/lcc/cpp/include.c @@ -40,7 +40,7 @@ doinclude(Tokenrow *trp) { char fname[256], iname[256]; Includelist *ip; - int angled, len, fd, i; + int angled, len, wlen, fd, i; trp->tp += 1; if (trp->tp>=trp->lp) @@ -92,9 +92,9 @@ doinclude(Tokenrow *trp) break; } if ( Mflag>1 || (!angled&&Mflag==1) ) { - write(1,objname,strlen(objname)); - write(1,iname,strlen(iname)); - write(1,"\n",1); + wlen = write(1,objname,strlen(objname)); + wlen = write(1,iname,strlen(iname)); + wlen = write(1,"\n",1); } if (fd >= 0) { if (++incdepth > 10) diff --git a/src/tools/lcc/cpp/tokens.c b/src/tools/lcc/cpp/tokens.c index 147569bf..90ea47f2 100644 --- a/src/tools/lcc/cpp/tokens.c +++ b/src/tools/lcc/cpp/tokens.c @@ -290,7 +290,7 @@ void puttokens(Tokenrow *trp) { Token *tp; - int len; + int len, wlen; uchar *p; if (verbose) @@ -305,15 +305,15 @@ puttokens(Tokenrow *trp) } if (len>OBS/2) { /* handle giant token */ if (wbp > wbuf) - write(1, wbuf, wbp-wbuf); - write(1, (char *)p, len); + wlen = write(1, wbuf, wbp-wbuf); + wlen = write(1, (char *)p, len); wbp = wbuf; } else { memcpy(wbp, p, len); wbp += len; } if (wbp >= &wbuf[OBS]) { - write(1, wbuf, OBS); + wlen = write(1, wbuf, OBS); if (wbp > &wbuf[OBS]) memcpy(wbuf, wbuf+OBS, wbp - &wbuf[OBS]); wbp -= OBS; @@ -327,8 +327,9 @@ puttokens(Tokenrow *trp) void flushout(void) { + int wlen; if (wbp>wbuf) { - write(1, wbuf, wbp-wbuf); + wlen = write(1, wbuf, wbp-wbuf); wbp = wbuf; } } |