archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8234185: Cleanup usage of canonicalize function between libjava, hotspot and libinstrument

Browse source 
Reviewed-by: dholmes, alanb, sspitsyn
This commit is contained in:
Christoph Langer 2019-12-06 14:13:10 +01:00
parent b8dbdd1232
commit 547e472c42
9 changed files with 54 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/share/native/libjava/jdk_util.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -45,6 +45,14 @@ extern "C" {
JNIEXPORT void
JDK_GetVersionInfo0(jdk_version_info* info, size_t info_size);
/*
* Export the platform dependent path canonicalization so that
* the VM can find it when loading system classes.
* This function is also used by the instrumentation agent.
*/
JNIEXPORT int
JDK_Canonicalize(const char *orig, char *out, int len);
#ifdef __cplusplus
} /* extern "C" */
#endif /* __cplusplus */

14
src/java.base/share/native/libjava/jni_util.c
View file

@ -934,20 +934,6 @@ JNU_ReleaseStringPlatformChars(JNIEnv *env, jstring jstr, const char *str)
free((void *)str);
}
/*
* Export the platform dependent path canonicalization so that
* VM can find it when loading system classes.
* This function is also used by the instrumentation agent.
*/
extern int canonicalize(char *path, const char *out, int len);
JNIEXPORT int
Canonicalize(JNIEnv *unused, char *orig, char *out, int len)
{
/* canonicalize an already natived path */
return canonicalize(orig, out, len);
}
JNIEXPORT jclass JNICALL
JNU_ClassString(JNIEnv *env)
{