]> granicus.if.org Git - libexpat/commitdiff
Add artificial scopes in xmltok.c utf8_toUtf8() to fix c89 compilation.
authorBenbuck Nason <bnason@netflix.com>
Mon, 21 Aug 2017 22:02:01 +0000 (15:02 -0700)
committerSebastian Pipping <sebastian@pipping.org>
Wed, 23 Aug 2017 13:49:24 +0000 (15:49 +0200)
expat/lib/xmltok.c

index 82e7acf3c057f6b1482d32575ba55ffe135dec6e..f105a49379f0f8e8796716ff4f209b01fcc2bdc4 100644 (file)
@@ -405,16 +405,20 @@ utf8_toUtf8(const ENCODING *UNUSED_P(enc),
   }
 
   /* Avoid copying partial characters (from incomplete input). */
-  const char * const fromLimBefore = fromLim;
-  align_limit_to_full_utf8_characters(*fromP, &fromLim);
-  if (fromLim < fromLimBefore) {
-    input_incomplete = true;
+  {
+    const char * const fromLimBefore = fromLim;
+    align_limit_to_full_utf8_characters(*fromP, &fromLim);
+    if (fromLim < fromLimBefore) {
+      input_incomplete = true;
+    }
   }
 
-  const ptrdiff_t bytesToCopy = fromLim - *fromP;
-  memcpy(*toP, *fromP, bytesToCopy);
-  *fromP += bytesToCopy;
-  *toP += bytesToCopy;
+  {
+    const ptrdiff_t bytesToCopy = fromLim - *fromP;
+    memcpy(*toP, *fromP, bytesToCopy);
+    *fromP += bytesToCopy;
+    *toP += bytesToCopy;
+  }
 
   if (output_exhausted)  // needs to go first
     return XML_CONVERT_OUTPUT_EXHAUSTED;