archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8234821: remove unused functions from libjli

Browse source 
Reviewed-by: clanger, alanb
This commit is contained in:
Matthias Baesken 2019-11-28 13:02:39 +01:00
parent 4f0cc5ab4a
commit 673c732a33
6 changed files with 12 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/java.base/share/native/libjli/java.c
View file

@ -102,6 +102,9 @@ static int numOptions, maxOptions;
/*
* Prototypes for functions internal to launcher.
*/
static const char* GetFullVersion();
static jboolean IsJavaArgs();
static void SetJavaLauncherProp();
static void SetClassPath(const char *s);
static void SetMainModule(const char *s);
static void SelectVersion(int argc, char **argv, char **main_class);
@ -643,8 +646,7 @@ checkMode(int mode, int newMode, const char *arg) {
/*
* Test if an arg identifies a source file.
*/
jboolean
IsSourceFile(const char *arg) {
static jboolean IsSourceFile(const char *arg) {
struct stat st;
return (JLI_HasSuffix(arg, ".java") && stat(arg, &st) == 0);
}
@ -1871,8 +1873,7 @@ SetJavaCommandLineProp(char *what, int argc, char **argv)
* JVM would like to know if it's created by a standard Sun launcher, or by
* user native application, the following property indicates the former.
*/
void
SetJavaLauncherProp() {
static void SetJavaLauncherProp() {
AddOption("-Dsun.java.launcher=SUN_STANDARD", NULL);
}
@ -2300,26 +2301,22 @@ ShowSplashScreen()
}
const char*
GetFullVersion()
static const char* GetFullVersion()
{
return _fVersion;
}
const char*
GetProgramName()
static const char* GetProgramName()
{
return _program_name;
}
const char*
GetLauncherName()
static const char* GetLauncherName()
{
return _launcher_name;
}
jboolean
IsJavaArgs()
static jboolean IsJavaArgs()
{
return _is_java_args;
}

5
src/java.base/share/native/libjli/java.h
View file

@ -162,7 +162,6 @@ int CallJavaMainInNewThread(jlong stack_size, void* args);
/* sun.java.launcher.* platform properties. */
void SetJavaCommandLineProp(char* what, int argc, char** argv);
void SetJavaLauncherProp(void);
/*
* Functions defined in java.c and used in java_md.c.
@ -174,10 +173,6 @@ jboolean IsWhiteSpaceOption(const char* name);
// Utility function defined in args.c
int isTerminalOpt(char *arg);
const char* GetProgramName();
const char* GetFullVersion();
jboolean IsJavaArgs();
jboolean IsJavaw();
int ContinueInNewThread(InvocationFunctions* ifn, jlong threadStackSize,