Reduced number of warnings

pull/213/head
M66B 1 year ago
parent ab6db5248a
commit 5ad3d57d0d

@ -217,6 +217,7 @@ public class ParameterList {
this(); this();
boolean recover = false; boolean recover = false;
boolean recovered = false;
HeaderTokenizer h = new HeaderTokenizer(s, HeaderTokenizer.MIME); HeaderTokenizer h = new HeaderTokenizer(s, HeaderTokenizer.MIME);
for (;;) { for (;;) {
HeaderTokenizer.Token tk = h.next(); HeaderTokenizer.Token tk = h.next();
@ -225,6 +226,7 @@ public class ParameterList {
if (recover) { if (recover) {
recover = false; recover = false;
recovered = true;
while (tk.getType() != HeaderTokenizer.Token.EOF && (char) tk.getType() != ';') while (tk.getType() != HeaderTokenizer.Token.EOF && (char) tk.getType() != ';')
tk = h.next(); tk = h.next();
} }
@ -240,13 +242,15 @@ public class ParameterList {
break; break;
// parameter name must be a MIME Atom // parameter name must be a MIME Atom
if (tk.getType() != HeaderTokenizer.Token.ATOM) { if (tk.getType() != HeaderTokenizer.Token.ATOM) {
StringBuilder sb = new StringBuilder(s); if (!recovered) {
int pos = h.getNextPos() - 1; StringBuilder sb = new StringBuilder(s);
if (pos < sb.length()) int pos = h.getNextPos() - 1;
sb.insert(pos, "^^^"); if (pos < sb.length())
eu.faircode.email.Log.w("In parameter list <" + sb + ">" + sb.insert(pos, "^^^");
", expected parameter name, " + eu.faircode.email.Log.w("In parameter list <" + sb + ">" +
"got \"" + tk.getValue() + "\""); ", expected parameter name, " +
"got \"" + tk.getValue() + "\"");
}
recover = true; recover = true;
continue; continue;
} }
@ -255,13 +259,15 @@ public class ParameterList {
// expect '=' // expect '='
tk = h.next(); tk = h.next();
if ((char)tk.getType() != '=') { if ((char)tk.getType() != '=') {
StringBuilder sb = new StringBuilder(s); if (!recovered) {
int pos = h.getNextPos() - 1; StringBuilder sb = new StringBuilder(s);
if (pos < sb.length()) int pos = h.getNextPos() - 1;
sb.insert(pos, "^^^"); if (pos < sb.length())
eu.faircode.email.Log.w("In parameter list <" + sb + ">" + sb.insert(pos, "^^^");
", expected '=', " + eu.faircode.email.Log.w("In parameter list <" + sb + ">" +
"got \"" + tk.getValue() + "\""); ", expected '=', " +
"got \"" + tk.getValue() + "\"");
}
recover = true; recover = true;
continue; continue;
} }
@ -278,13 +284,15 @@ public class ParameterList {
// parameter value must be a MIME Atom or Quoted String // parameter value must be a MIME Atom or Quoted String
if (type != HeaderTokenizer.Token.ATOM && if (type != HeaderTokenizer.Token.ATOM &&
type != HeaderTokenizer.Token.QUOTEDSTRING) { type != HeaderTokenizer.Token.QUOTEDSTRING) {
StringBuilder sb = new StringBuilder(s); if (!recovered) {
int pos = h.getNextPos() - 1; StringBuilder sb = new StringBuilder(s);
if (pos < sb.length()) int pos = h.getNextPos() - 1;
sb.insert(pos, "^^^"); if (pos < sb.length())
eu.faircode.email.Log.w("In parameter list <" + sb + ">" + sb.insert(pos, "^^^");
", expected parameter value, " + eu.faircode.email.Log.w("In parameter list <" + sb + ">" +
"got \"" + tk.getValue() + "\""); ", expected parameter value, " +
"got \"" + tk.getValue() + "\"");
}
recover = true; recover = true;
continue; continue;
} }
@ -313,13 +321,15 @@ public class ParameterList {
value = lastValue + " " + tk.getValue(); value = lastValue + " " + tk.getValue();
list.put(lastName, value); list.put(lastName, value);
} else { } else {
StringBuilder sb = new StringBuilder(s); if (!recovered) {
int pos = h.getNextPos() - 1; StringBuilder sb = new StringBuilder(s);
if (pos < sb.length()) int pos = h.getNextPos() - 1;
sb.insert(pos, "^^^"); if (pos < sb.length())
eu.faircode.email.Log.w("In parameter list <" + sb + ">" + sb.insert(pos, "^^^");
", expected ';', got \"" + eu.faircode.email.Log.w("In parameter list <" + sb + ">" +
tk.getValue() + "\""); ", expected ';', got \"" +
tk.getValue() + "\"");
}
recover = true; recover = true;
continue; continue;
} }

Loading…
Cancel
Save