Skip to content

Commit

Permalink
Additional clean up to remove redundant code
Browse files Browse the repository at this point in the history
  • Loading branch information
@cowtowncoder
cowtowncoder committed Jan 2, 2021
1 parent ac6758f commit 46ea1b4
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 32 deletions.
44 changes: 21 additions & 23 deletions src/main/java/com/ctc/wstx/io/InputBootstrapper.java
View file
Expand Up @@ -95,28 +95,28 @@ public abstract class InputBootstrapper
////////////////////////////////////////
*/

//boolean mHadDeclaration = false;
//protected boolean mHadDeclaration = false;

/**
* XML declaration from the input (1.0, 1.1 or 'unknown')
*/
int mDeclaredXmlVersion = XmlConsts.XML_V_UNKNOWN;
protected int mDeclaredXmlVersion = XmlConsts.XML_V_UNKNOWN;

/**
* Value of encoding pseudo-attribute from xml declaration, if
* one was found; null otherwise.
*/
String mFoundEncoding;
protected String mFoundEncoding;

String mStandalone;
protected String mStandalone;

/**
* Flag that indicates whether input read from this input source
* needs to be xml 1.1 compliant or not; if not, xml 1.0 is assumed.
* State of this flag depends on parent context (if one existed), or if
* not, on xml declaration of this input source.
*/
boolean mXml11Handling = false;
protected boolean mXml11Handling = false;

/*
////////////////////////////////////////
Expand All @@ -130,7 +130,7 @@ public abstract class InputBootstrapper
* for the longest anticipated encoding id... and maybe few chars just
* in case (for additional white space that we ignore)
*/
final char[] mKeyword = new char[60];
protected final char[] mKeywordBuffer = new char[60];

/*
////////////////////////////////////////
Expand Down Expand Up @@ -318,11 +318,11 @@ private final int readXmlVersion()
reportUnexpectedChar(c, XmlConsts.XML_DECL_KW_VERSION);
}
c = handleEq(XmlConsts.XML_DECL_KW_VERSION);
int len = readQuotedValue(mKeyword, c);
int len = readQuotedValue(mKeywordBuffer, c);

if (len == 3) {
if (mKeyword[0] == '1' && mKeyword[1] == '.') {
c = mKeyword[2];
if (mKeywordBuffer[0] == '1' && mKeywordBuffer[1] == '.') {
c = mKeywordBuffer[2];
if (c == '0') {
return XmlConsts.XML_V_10;
}
Expand All @@ -336,11 +336,11 @@ private final int readXmlVersion()
String got;

if (len < 0) {
got = "'"+new String(mKeyword)+"[..]'";
got = "'"+new String(mKeywordBuffer)+"[..]'";
} else if (len == 0) {
got = "<empty>";
} else {
got = "'"+new String(mKeyword, 0, len)+"'";
got = "'"+new String(mKeywordBuffer, 0, len)+"'";
}
reportPseudoAttrProblem(XmlConsts.XML_DECL_KW_VERSION, got,
XmlConsts.XML_V_10_STR, XmlConsts.XML_V_11_STR);
Expand All @@ -356,20 +356,18 @@ private final String readXmlEncoding()
}
c = handleEq(XmlConsts.XML_DECL_KW_ENCODING);

int len = readQuotedValue(mKeyword, c);
int len = readQuotedValue(mKeywordBuffer, c);

/* Hmmh. How about "too long" encodings? Maybe just truncate them,
* for now?
*/
// How about "too long" encodings? Maybe just truncate them for now?
if (len == 0) { // let's still detect missing value...
reportPseudoAttrProblem(XmlConsts.XML_DECL_KW_ENCODING, null,
null, null);
}

if (len < 0) { // will be truncated...
return new String(mKeyword);
return new String(mKeywordBuffer);
}
return new String(mKeyword, 0, len);
return new String(mKeywordBuffer, 0, len);
}

private final String readXmlStandalone()
Expand All @@ -380,15 +378,15 @@ private final String readXmlStandalone()
reportUnexpectedChar(c, XmlConsts.XML_DECL_KW_STANDALONE);
}
c = handleEq(XmlConsts.XML_DECL_KW_STANDALONE);
int len = readQuotedValue(mKeyword, c);
int len = readQuotedValue(mKeywordBuffer, c);

if (len == 2) {
if (mKeyword[0] == 'n' && mKeyword[1] == 'o') {
if (mKeywordBuffer[0] == 'n' && mKeywordBuffer[1] == 'o') {
return XmlConsts.XML_SA_NO;
}
} else if (len == 3) {
if (mKeyword[0] == 'y' && mKeyword[1] == 'e'
&& mKeyword[2] == 's') {
if (mKeywordBuffer[0] == 'y' && mKeywordBuffer[1] == 'e'
&& mKeywordBuffer[2] == 's') {
return XmlConsts.XML_SA_YES;
}
}
Expand All @@ -397,11 +395,11 @@ private final String readXmlStandalone()
String got;

if (len < 0) {
got = "'"+new String(mKeyword)+"[..]'";
got = "'"+new String(mKeywordBuffer)+"[..]'";
} else if (len == 0) {
got = "<empty>";
} else {
got = "'"+new String(mKeyword, 0, len)+"'";
got = "'"+new String(mKeywordBuffer, 0, len)+"'";
}

reportPseudoAttrProblem(XmlConsts.XML_DECL_KW_STANDALONE, got,
Expand Down
15 changes: 6 additions & 9 deletions src/main/java/com/ctc/wstx/io/StreamBootstrapper.java
View file
Expand Up @@ -596,15 +596,15 @@ protected int checkKeyword(String exp)
}

@Override
protected int readQuotedValue(char[] kw, int quoteChar)
protected int readQuotedValue(char[] outputBuffer, int quoteChar)
throws IOException, WstxException
{
int i = 0;
int len = kw.length;
int outputPtr = 0;
int outputBufferLen = outputBuffer.length;
boolean simple = (mBytesPerChar == 1);
boolean mb = !simple && (mBytesPerChar > 1);

while (i < len) {
while (outputPtr < outputBufferLen) {
int c;

if (simple) {
Expand Down Expand Up @@ -635,12 +635,9 @@ protected int readQuotedValue(char[] kw, int quoteChar)
}

if (c == quoteChar) {
return (i < len) ? i : -1;
}

if (i < len) {
kw[i++] = (char) c;
return outputPtr;
}
outputBuffer[outputPtr++] = (char) c;
}

// If we end up this far, we ran out of buffer space... let's let
Expand Down

0 comments on commit 46ea1b4

Please sign in to comment.