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

1 files changed, 8 insertions, 6 deletions

diff --git a/Source/DOH/fio.c b/Source/DOH/fio.c
index c4fbb1e8f..573bebe7b 100644
--- a/Source/DOH/fio.c
+++ b/Source/DOH/fio.c
@@ -481,14 +481,16 @@ int DohCopyto(DOH *in, DOH *out) {
       cw = buffer;
       while (nwrite) {
 	wret = Write(out, cw, nwrite);
-	if (wret < 0)
-	  return -1;
+	if (wret < 0) {
+	  nbytes = -1;
+	  break;
+	}
 	nwrite = nwrite - wret;
 	cw += wret;
       }
       nbytes += ret;
     } else {
-      return nbytes;
+      break;
     }
   }
   return nbytes;
@@ -579,12 +581,12 @@ DOH *DohReadline(DOH *in) {
     if (Read(in, &c, 1) < 0) {
       if (n == 0) {
 	Delete(s);
-	return 0;
+	s = 0;
       }
-      return s;
+      break;
     }
     if (c == '\n')
-      return s;
+      break;
     if (c == '\r')
       continue;
     Putc(c, s);