summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2011-07-07 11:30:38 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2011-07-07 11:30:38 +0000
commit90d84296530e154dd079db544606ffdf9bc1d158 (patch)
tree139de9d947b1f53572004492c5a27002c1829e66
parent3413a6a4270a01c5eb77d886b022e9d19b93eb77 (diff)
downloadclasspath-90d84296530e154dd079db544606ffdf9bc1d158.tar.gz
PR classpath/45527: Replace '$' with '_' rather than '_00024'.
2011-07-07 Andrew John Hughes <ahughes@redhat.com> PR classpath/45527 * tools/gnu/classpath/tools/javah/JniHelper.java: (mangle(String)): Replace '$' with '_' rather than encoding it as hex.
-rw-r--r--ChangeLog7
-rw-r--r--tools/gnu/classpath/tools/javah/JniHelper.java2
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index eb30d80b6..56ab4539a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-07-07 Andrew John Hughes <ahughes@redhat.com>
+ PR classpath/45527
+ * tools/gnu/classpath/tools/javah/JniHelper.java:
+ (mangle(String)): Replace '$' with '_' rather than
+ encoding it as hex.
+
+2011-07-07 Andrew John Hughes <ahughes@redhat.com>
+
PR classpath/40188
* tools/gnu/classpath/tools/javah/JniIncludePrinter.java:
(writeFields(ClassWrapper,JniPrintStream)): Retain a
diff --git a/tools/gnu/classpath/tools/javah/JniHelper.java b/tools/gnu/classpath/tools/javah/JniHelper.java
index 9225444be..9a723cadf 100644
--- a/tools/gnu/classpath/tools/javah/JniHelper.java
+++ b/tools/gnu/classpath/tools/javah/JniHelper.java
@@ -104,6 +104,8 @@ public class JniHelper
result.append("_3");
else if (c == '/')
result.append("_");
+ else if (c == '$')
+ result.append("_");
else if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z')
|| (c >= 'A' && c <= 'Z'))
result.append(c);