Rework warning fixes in rev 13512 as it introduces dead code flagged by sun studio

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13969 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2012-12-15 14:55:54 +00:00
commit 6679f5dcd0

View file

@ -481,14 +481,16 @@ int DohCopyto(DOH *in, DOH *out) {
cw = buffer; cw = buffer;
while (nwrite) { while (nwrite) {
wret = Write(out, cw, nwrite); wret = Write(out, cw, nwrite);
if (wret < 0) if (wret < 0) {
return -1; nbytes = -1;
break;
}
nwrite = nwrite - wret; nwrite = nwrite - wret;
cw += wret; cw += wret;
} }
nbytes += ret; nbytes += ret;
} else { } else {
return nbytes; break;
} }
} }
return nbytes; return nbytes;
@ -579,12 +581,12 @@ DOH *DohReadline(DOH *in) {
if (Read(in, &c, 1) < 0) { if (Read(in, &c, 1) < 0) {
if (n == 0) { if (n == 0) {
Delete(s); Delete(s);
return 0; s = 0;
} }
return s; break;
} }
if (c == '\n') if (c == '\n')
return s; break;
if (c == '\r') if (c == '\r')
continue; continue;
Putc(c, s); Putc(c, s);