You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2021/11/02 11:26:46 UTC
[jena] branch main updated: JENA-2188: Fix use of format in
tokenizer messages
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 2fe5d95 JENA-2188: Fix use of format in tokenizer messages
new 896b428 Merge pull request #1097 from afs/jena2188-format
2fe5d95 is described below
commit 2fe5d95cd94e592616ce039fd2ca71652109beb9
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri Oct 29 17:52:52 2021 +0100
JENA-2188: Fix use of format in tokenizer messages
---
.../org/apache/jena/riot/tokens/TokenizerText.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java b/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
index ff1fd13..d30f25b 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
@@ -203,7 +203,7 @@ public final class TokenizerText implements Tokenizer
//token.setImage("<<");
return token;
}
- fatal("Internal error - parsed '"+chPeek+"' after '<'");
+ fatal("Internal error - parsed '%c' after '<'", chPeek);
}
// ---- Literal
@@ -769,10 +769,10 @@ public final class TokenizerText implements Tokenizer
warning("Unicode replacement character U+FFFD in string");
else if ( ch == EOF ) {
// if ( endNL ) return stringBuilder.toString();
- fatal("Broken token: " + stringBuilder.toString());
+ fatal("Broken token: %s", stringBuilder.toString());
}
else if ( ch == NL )
- fatal("Broken token (newline): " + stringBuilder.toString());
+ fatal("Broken token (newline): %s", stringBuilder.toString());
else if ( ch == endCh )
return stringBuilder.toString();
else if ( ch == CH_RSLASH )
@@ -888,7 +888,7 @@ public final class TokenizerText implements Tokenizer
// Not strict
if ( !RiotChars.isPNChars_U_N(ch) )
- fatal("Blank node label does not start with alphabetic or _ :" + (char)ch);
+ fatal("Blank node label does not start with alphabetic or _ : '%c'", (char)ch);
reader.readChar();
if ( ch == REPLACEMENT )
warning("Unicode replacement character U+FFFD in blank node label");
@@ -1031,7 +1031,7 @@ public final class TokenizerText implements Tokenizer
x++;
}
if ( x == 0 )
- fatal("No hex characters after " + sb.toString());
+ fatal("No hex characters after %s", sb.toString());
}
private int readDigits(StringBuilder buffer) {
@@ -1089,7 +1089,7 @@ public final class TokenizerText implements Tokenizer
readPossibleSign(sb);
int x = readDigits(sb);
if ( x == 0 )
- fatal("Malformed double: " + sb);
+ fatal("Malformed double: %s", sb);
return true;
}
@@ -1295,7 +1295,7 @@ public final class TokenizerText implements Tokenizer
int x = valHexChar(ch);
if ( x != -1 )
return x;
- fatal("Not a hexadecimal character: " + (char)ch);
+ fatal("Not a hexadecimal character: '%c'", (char)ch);
return -1;
}
@@ -1303,12 +1303,12 @@ public final class TokenizerText implements Tokenizer
for (int i = 0; i < str.length(); i++) {
char want = str.charAt(i);
if ( reader.eof() ) {
- fatal("End of input during expected string: " + str);
+ fatal("End of input during expected string: %s", str);
return false;
}
int inChar = reader.peekChar();
if ( inChar != want ) {
- fatal("expected \"" + str + "\"");
+ fatal("expected \"%s\"", str);
return false;
}
reader.readChar();