Minor refactoring for error handling

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java

@@ -2500,7 +2500,7 @@ private final String _finishLongText(int len) throws IOException
                 break;
             default:
                 // Is this good enough error message?
-                _reportInvalidChar(c);
+                _reportInvalidInitial(c);
             }
             // Need more room?
             if (outPtr >= outEnd) {
@@ -2603,7 +2603,7 @@ private final void _finishChunkedText() throws IOException
                 break;
             default:
                 // Is this good enough error message?
-                _reportInvalidChar(c);
+                _reportInvalidInitial(c);
             }
             // Need more room?
             if (outPtr >= outEnd) {
@@ -3833,7 +3833,7 @@ protected void _invalidToken(int ch) throws JsonParseException {
         throw _constructError("Invalid CBOR value token (first byte): 0x"+Integer.toHexString(ch));
     }
 
-    protected void _reportUnexpectedBreak() throws IOException {
+    protected <T> T _reportUnexpectedBreak() throws IOException {
         if (_streamReadContext.inRoot()) {
             throw _constructError("Unexpected Break (0xFF) token in Root context");
         }
@@ -3842,14 +3842,6 @@ protected void _reportUnexpectedBreak() throws IOException {
                 +(_streamReadContext.inObject() ? "Object" : "Array" ));
     }
 
-    protected void _reportInvalidChar(int c) throws JsonParseException {
-        // Either invalid WS or illegal UTF-8 start char
-        if (c < ' ') {
-            _throwInvalidSpace(c);
-        }
-        _reportInvalidInitial(c);
-    }
-
     protected void _reportInvalidInitial(int mask) throws JsonParseException {
         _reportError("Invalid UTF-8 start byte 0x"+Integer.toHexString(mask));
     }

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParser.java

@@ -2582,7 +2582,7 @@ private final void _decodeLongUnicodeValue() throws IOException
                 break;
             default:
                 // Is this good enough error message?
-                _reportInvalidChar(c);
+                _reportInvalidInitial(c);
             }
             // Need more room?
             if (outPtr >= outBuf.length) {
@@ -3053,15 +3053,6 @@ protected void _reportInvalidSharedStringValue(int index) throws IOException
        _reportError("Invalid shared text value reference "+index+"; only got "+_seenStringValueCount+" names in buffer (invalid content)");
     }
 
-    protected void _reportInvalidChar(int c) throws JsonParseException
-    {
-        // Either invalid WS or illegal UTF-8 start char
-        if (c < ' ') {
-            _throwInvalidSpace(c);
-        }
-        _reportInvalidInitial(c);
-    }
-
     protected void _reportInvalidInitial(int mask) throws JsonParseException {
         _reportError("Invalid UTF-8 start byte 0x"+Integer.toHexString(mask));
     }