Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug=81484

Browse Source 
author=ashuk
Patch provided by Harshal (keeda@hotpop.com)

This patch introduces explicit (jchar*) static
casts in calls to JNIEnv_::NewString in the
JavaDOM code. This is needed for compliance
with the strict type-checking og gcc 2.96+.

Modified files are:
M jni/org_mozilla_dom_AttrImpl.cpp
M jni/org_mozilla_dom_CharacterDataImpl.cpp
M jni/org_mozilla_dom_DocumentTypeImpl.cpp
M jni/org_mozilla_dom_ElementImpl.cpp
M jni/org_mozilla_dom_EntityImpl.cpp
M jni/org_mozilla_dom_NodeImpl.cpp
M jni/org_mozilla_dom_NotationImpl.cpp
M jni/org_mozilla_dom_ProcessingInstructionImpl.cpp
M jni/org_mozilla_dom_events_EventImpl.cpp
M src/nsJavaDOMImpl.cpp


git-svn-id: svn://10.0.0.236/trunk@95726 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ashuk%eng.sun.com
2001-05-22 23:22:58 +00:00
parent 72939dbcb6
commit 6e175c40bf
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/java/dom/jni/org_mozilla_dom_AttrImpl.cpp
View File

@@ -48,7 +48,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_AttrImpl_getName
return NULL;
}
jstring jname = env->NewString(name.GetUnicode(), name.Length());
jstring jname = env->NewString((jchar*) name.GetUnicode(), name.Length());
if (!jname) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Attr.getName: NewString failed\n"));
@@ -108,7 +108,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_AttrImpl_getValue
return NULL;
}
jstring jval = env->NewString(value.GetUnicode(), value.Length());
jstring jval = env->NewString((jchar*) value.GetUnicode(), value.Length());
if (!jval) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Attr.getValue: NewString failed\n"));

4
mozilla/java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp
View File

@@ -125,7 +125,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_getData
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"CharacterData.getData: NewString failed");
@@ -313,7 +313,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_substringData
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"CharacterData.substringData: NewString failed");

8
mozilla/java/dom/jni/org_mozilla_dom_DocumentTypeImpl.cpp
View File

@@ -92,7 +92,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_DocumentTypeImpl_getName
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("DocumentType.getName: NewString failed\n"));
@@ -167,7 +167,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_DocumentTypeImpl_getPublicId
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("DocumentType.getPublicId: NewString failed\n"));
@@ -200,7 +200,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_DocumentTypeImpl_getSystemId
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("DocumentType.getSystemId: NewString failed\n"));
@@ -233,7 +233,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_DocumentTypeImpl_getInternalSubse
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("DocumentType.getInternalSubset: NewString failed\n"));

6
mozilla/java/dom/jni/org_mozilla_dom_ElementImpl.cpp
View File

@@ -58,7 +58,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getAttribute
return NULL;
}
jstring jattr = env->NewString(attr.GetUnicode(), attr.Length());
jstring jattr = env->NewString((jchar*) attr.GetUnicode(), attr.Length());
if (!jattr) {
JavaDOMGlobals::ThrowException(env,
"Element.getAttribute: NewString failed");
@@ -190,7 +190,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getTagName
return NULL;
}
jstring jTagName = env->NewString(tagName.GetUnicode(), tagName.Length());
jstring jTagName = env->NewString((jchar*) tagName.GetUnicode(), tagName.Length());
if (!jTagName) {
JavaDOMGlobals::ThrowException(env,
"Element.getTagName: NewString failed");
@@ -453,7 +453,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getAttributeNS
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Element.getAttributeNS: NewString failed\n"));

6
mozilla/java/dom/jni/org_mozilla_dom_EntityImpl.cpp
View File

@@ -49,7 +49,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getNotationName
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Entity.getNotationName: NewString failed\n"));
@@ -83,7 +83,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getPublicId
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Entity.getPublicId: NewString failed\n"));
@@ -117,7 +117,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getSystemId
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Entity.getSystemId: NewString failed\n"));

10
mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp
View File

@@ -561,7 +561,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeName
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"Node.getNodeName: NewString failed");
@@ -700,7 +700,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeValue
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"Node.getNodeValue: NewString failed");
@@ -1180,7 +1180,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNamespaceURI
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Node.getNamespaceURI: NewString failed\n"));
@@ -1214,7 +1214,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getPrefix
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Node.getPrefix: NewString failed\n"));
@@ -1284,7 +1284,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getLocalName
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Node.getLocalName: NewString failed\n"));

4
mozilla/java/dom/jni/org_mozilla_dom_NotationImpl.cpp
View File

@@ -49,7 +49,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NotationImpl_getPublicId
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Notation.getPublicId: NewString failed\n"));
@@ -83,7 +83,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NotationImpl_getSystemId
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR,
("Notation.getSystemId: NewString failed\n"));

4
mozilla/java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp
View File

@@ -50,7 +50,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_getData
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"ProcessingInstruction.getData: NewString failed");
@@ -84,7 +84,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_getTarg
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"ProcessingInstruction.getTarget: NewString failed");

2
mozilla/java/dom/jni/org_mozilla_dom_events_EventImpl.cpp
View File

@@ -221,7 +221,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_events_EventImpl_getType
return NULL;
}
jstring jret = env->NewString(ret.GetUnicode(), ret.Length());
jstring jret = env->NewString((jchar*) ret.GetUnicode(), ret.Length());
if (!jret) {
JavaDOMGlobals::ThrowException(env,
"Event.getType: NewString failed");

4
mozilla/java/dom/src/nsJavaDOMImpl.cpp
View File

@@ -343,7 +343,7 @@ NS_IMETHODIMP nsJavaDOMImpl::OnStatusChange(nsIWebProgress *aWebProgress,
if (!jURL) return NS_ERROR_FAILURE;
// PENDING(edburns): this leaks
jstring jMessage = env->NewString(cMsg, nsCRT::strlen(cMsg));
jstring jMessage = env->NewString((jchar*) cMsg, nsCRT::strlen(cMsg));
if (!jMessage) return NS_ERROR_FAILURE;
env->CallStaticVoidMethod(domAccessorClass,
@@ -375,7 +375,7 @@ NS_IMETHODIMP nsJavaDOMImpl::doStartDocumentLoad(const PRUnichar *documentName)
if (!documentName) {
return NS_ERROR_FAILURE;
}
jstring jURL = env->NewString(documentName, nsCRT::strlen(documentName));
jstring jURL = env->NewString((jchar*) documentName, nsCRT::strlen(documentName));
if (!jURL) return NS_ERROR_FAILURE;
env->CallStaticVoidMethod(domAccessorClass,