Skip to content

Quiet new gcc implicit-fallthrough warnings, and some minor Java lint #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcflack merged 2 commits into from
Nov 26, 2020
Merged

Quiet new gcc implicit-fallthrough warnings, and some minor Java lint #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c8d992
Add FALLTHROUGH comments in C switch statements
jcflack Nov 21, 2020
2081148
Two bits of Java lint
jcflack Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pljava-examples/src/main/java/org/postgresql/pljava/example/annotation/PassXML.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@ private static Source sxToSource(SQLXML sx, int how, ResultSet adjust)
}

if ( s instanceof Adjusting.XML.Source )
return applyAdjustments(adjust, (Adjusting.XML.Source)s).get();
return applyAdjustments(adjust, (Adjusting.XML.Source<?>)s).get();
return s;
}

Expand Down Expand Up @@ -1275,7 +1275,7 @@ private static Result sxToResult(SQLXML sx, int how, ResultSet adjust)
}

if ( r instanceof Adjusting.XML.Result )
return applyAdjustments(adjust, (Adjusting.XML.Result)r).get();
return applyAdjustments(adjust, (Adjusting.XML.Result<?>)r).get();
return r;
}

Expand Down
13 changes: 13 additions & 0 deletions pljava-so/src/main/c/Backend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ static void initsequencer(enum initstage is, bool tolerant)
initstage = IS_GUCS_REGISTERED;
if ( deferInit )
return;
/*FALLTHROUGH*/

case IS_GUCS_REGISTERED:
if ( NULL == libjvmlocation )
Expand All @@ -530,6 +531,7 @@ static void initsequencer(enum initstage is, bool tolerant)
goto check_tolerant;
}
initstage = IS_CAND_JVMLOCATION;
/*FALLTHROUGH*/

case IS_CAND_JVMLOCATION:
if ( NULL == policy_urls )
Expand All @@ -542,6 +544,7 @@ static void initsequencer(enum initstage is, bool tolerant)
goto check_tolerant;
}
initstage = IS_CAND_POLICYURLS;
/*FALLTHROUGH*/

case IS_CAND_POLICYURLS:
if ( ! pljavaEnabled )
Expand All @@ -556,6 +559,7 @@ static void initsequencer(enum initstage is, bool tolerant)
goto check_tolerant;
}
initstage = IS_PLJAVA_ENABLED;
/*FALLTHROUGH*/

case IS_PLJAVA_ENABLED:
libjvm_handle = pg_dlopen(libjvmlocation);
Expand All @@ -569,6 +573,7 @@ static void initsequencer(enum initstage is, bool tolerant)
goto check_tolerant;
}
initstage = IS_CAND_JVMOPENED;
/*FALLTHROUGH*/

case IS_CAND_JVMOPENED:
pljava_createvm =
Expand All @@ -592,6 +597,7 @@ static void initsequencer(enum initstage is, bool tolerant)
goto check_tolerant;
}
initstage = IS_CREATEVM_SYM_FOUND;
/*FALLTHROUGH*/

case IS_CREATEVM_SYM_FOUND:
s_javaLogLevel = INFO;
Expand All @@ -605,6 +611,7 @@ static void initsequencer(enum initstage is, bool tolerant)
pljavaDebug = 1;
#endif
initstage = IS_MISC_ONCE_DONE;
/*FALLTHROUGH*/

case IS_MISC_ONCE_DONE:
JVMOptList_init(&optList); /* uses CurrentMemoryContext */
Expand All @@ -625,6 +632,7 @@ static void initsequencer(enum initstage is, bool tolerant)
JVMOptList_add(&optList, effectiveModulePath, 0, true);
}
initstage = IS_JAVAVM_OPTLIST;
/*FALLTHROUGH*/

case IS_JAVAVM_OPTLIST:
JNIresult = initializeJavaVM(&optList); /* frees the optList */
Expand All @@ -648,6 +656,7 @@ static void initsequencer(enum initstage is, bool tolerant)
jvmStartedAtLeastOnce = true;
elog(DEBUG2, "successfully created Java virtual machine");
initstage = IS_JAVAVM_STARTED;
/*FALLTHROUGH*/

case IS_JAVAVM_STARTED:
#ifdef USE_PLJAVA_SIGHANDLERS
Expand All @@ -659,6 +668,7 @@ static void initsequencer(enum initstage is, bool tolerant)
*/
on_proc_exit(_destroyJavaVM, 0);
initstage = IS_SIGHANDLERS;
/*FALLTHROUGH*/

case IS_SIGHANDLERS:
Invocation_pushBootContext(&ctx);
Expand Down Expand Up @@ -709,6 +719,7 @@ static void initsequencer(enum initstage is, bool tolerant)
_destroyJavaVM(0, 0);
goto check_tolerant;
}
/*FALLTHROUGH*/

case IS_PLJAVA_FOUND:
greeting = InstallHelper_hello();
Expand All @@ -717,11 +728,13 @@ static void initsequencer(enum initstage is, bool tolerant)
errdetail("versions:\n%s", greeting)));
pfree(greeting);
initstage = IS_PLJAVA_INSTALLING;
/*FALLTHROUGH*/

case IS_PLJAVA_INSTALLING:
if ( NULL != pljavaLoadPath )
InstallHelper_groundwork(); /* sqlj schema, language handlers, ...*/
initstage = IS_COMPLETE;
/*FALLTHROUGH*/

case IS_COMPLETE:
pljavaLoadingAsExtension = false;
Expand Down
3 changes: 3 additions & 0 deletions pljava-so/src/main/c/type/Type.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ static Type _getCoerce(Type self, Type other, Oid fromOid, Oid toOid,
case COERCION_PATH_NONE:
elog(ERROR, "no conversion function from (regtype) %d to %d",
fromOid, toOid);
pg_unreachable(); /*elog(ERROR is already so marked; what's with gcc?*/
case COERCION_PATH_RELABELTYPE:
/*
* Binary compatible type. No need for a special coercer.
Expand All @@ -255,9 +256,11 @@ static Type _getCoerce(Type self, Type other, Oid fromOid, Oid toOid,
case COERCION_PATH_COERCEVIAIO:
elog(ERROR, "COERCEVIAIO not implemented from (regtype) %d to %d",
fromOid, toOid);
pg_unreachable();
case COERCION_PATH_ARRAYCOERCE:
elog(ERROR, "ARRAYCOERCE not implemented from (regtype) %d to %d",
fromOid, toOid);
pg_unreachable();
case COERCION_PATH_FUNC:
break;
}
Expand Down