From: drl7x <drl7x>
Date: Fri, 11 Apr 2003 19:17:59 +0000 (+0000)
Subject: Cleaned up code in doMergeString
X-Git-Tag: splint-3_1_0~22
X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/commitdiff_plain/846c7865dde602c051b935bb63507e1e53c4489a

Cleaned up code in doMergeString
---

diff --git a/src/cstring.c b/src/cstring.c
index 4c9f2c0..90d0c17 100644
--- a/src/cstring.c
+++ b/src/cstring.c
@@ -953,7 +953,8 @@ static mstring doMergeString (cstring s)
 	      retPtr++;
 	      *retPtr = '\0';
 	      BADEXIT;
-	      return ret;
+
+	      /*@notreached@*/ return ret;
 	    }
 	  else
 	    {
@@ -969,7 +970,7 @@ static mstring doMergeString (cstring s)
       ptr++;
       
     }/* end while */
-  retPtr = '\0';
+  *retPtr = '\0';
   return ret;
 }
 
@@ -1111,7 +1112,8 @@ static mstring doExpandEscapes (cstring s, /*@out@*/ size_t *len)
   /* add the null character */
   *retPtr = '\0';
 
-  *len = retPtr - ret;
+  llassert(  (retPtr-ret) >= 0 );
+  *len = (size_t)(retPtr - ret);
   return ret;
 }