[rtems-tools commit] rtemstoolkit: More warning fixes to ConvertUTF.c

Chris Johns chrisj at rtems.org
Sun May 6 03:52:50 UTC 2018


Module:    rtems-tools
Branch:    master
Commit:    b0b936680730a19ac79a2b3651d188052952dbbc
Changeset: http://git.rtems.org/rtems-tools/commit/?id=b0b936680730a19ac79a2b3651d188052952dbbc

Author:    Chris Johns <chrisj at rtems.org>
Date:      Sun May  6 13:21:18 2018 +1000

rtemstoolkit: More warning fixes to ConvertUTF.c

---

 rtemstoolkit/ConvertUTF.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/rtemstoolkit/ConvertUTF.c b/rtemstoolkit/ConvertUTF.c
index fa1b8ed..d849a4c 100644
--- a/rtemstoolkit/ConvertUTF.c
+++ b/rtemstoolkit/ConvertUTF.c
@@ -267,10 +267,10 @@ ConversionResult ConvertUTF16toUTF8 (
 	    target -= bytesToWrite; result = targetExhausted; break;
 	}
 	switch (bytesToWrite) { /* note: everything falls through. */
-	    case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-	    case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-	    case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
-	    case 1: *--target =  (UTF8)(ch | firstByteMark[bytesToWrite]);
+	    case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6; /* fall-thru */
+	    case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6; /* fall-thru */
+	    case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6; /* fall-thru */
+	    case 1: *--target =  (UTF8)(ch | firstByteMark[bytesToWrite]);    /* fall-thru */
 	}
 	target += bytesToWrite;
     }
@@ -298,9 +298,9 @@ static Boolean isLegalUTF8(const UTF8 *source, int length) {
     switch (length) {
     default: return false;
 	/* Everything else falls through when "true"... */
-    case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
-    case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
-    case 2: if ((a = (*--srcptr)) > 0xBF) return false;
+    case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false; /* fall-thru */
+    case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false; /* fall-thru */
+    case 2: if ((a = (*--srcptr)) > 0xBF) return false;             /* fall-thru */
 
 	switch (*source) {
 	    /* no fall-through in this inner switch */
@@ -308,10 +308,10 @@ static Boolean isLegalUTF8(const UTF8 *source, int length) {
 	    case 0xED: if (a > 0x9F) return false; break;
 	    case 0xF0: if (a < 0x90) return false; break;
 	    case 0xF4: if (a > 0x8F) return false; break;
-	    default:   if (a < 0x80) return false;
+	    default:   if (a < 0x80) return false; break;
 	}
 
-    case 1: if (*source >= 0x80 && *source < 0xC2) return false;
+    case 1: if (*source >= 0x80 && *source < 0xC2) return false; /* fall-thru */
     }
     if (*source > 0xF4) return false;
     return true;
@@ -354,12 +354,12 @@ ConversionResult ConvertUTF8toUTF16 (
 	 * The cases all fall through. See "Note A" below.
 	 */
 	switch (extraBytesToRead) {
-	    case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-	    case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-	    case 3: ch += *source++; ch <<= 6;
-	    case 2: ch += *source++; ch <<= 6;
-	    case 1: ch += *source++; ch <<= 6;
-	    case 0: ch += *source++;
+	    case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */ /* fall-thru */
+	    case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */ /* fall-thru */
+	    case 3: ch += *source++; ch <<= 6; /* fall-thru */
+	    case 2: ch += *source++; ch <<= 6; /* fall-thru */
+	    case 1: ch += *source++; ch <<= 6; /* fall-thru */
+	    case 0: ch += *source++;           /* fall-thru */
 	}
 	ch -= offsetsFromUTF8[extraBytesToRead];
 




More information about the vc mailing list