replace nsString.ToNewCString with GetBuffer

java/dom/jni/org_mozilla_dom_AttrImpl.cpp

@@ -43,13 +43,12 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_AttrImpl_getName
     return NULL;
   }
 
-  char* cname = name.ToNewCString();
+  const char* cname = name.GetBuffer();
   jstring jname = env->NewStringUTF(cname);
   if (!jname) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("Attr.getName: NewStringUTF failed: %s\n", cname));
   }
-  delete[] cname;
 
   return jname;
 }
@@ -105,13 +104,12 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_AttrImpl_getValue
     return NULL;
   }
 
-  char* cvalue = value.ToNewCString();
+  const char* cvalue = value.GetBuffer();
   jstring jval = env->NewStringUTF(cvalue);
   if (!jval) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("Attr.getValue: NewStringUTF failed: %s\n", cvalue));
   }
-  delete[] cvalue;
 
   return jval;
 }

java/dom/jni/org_mozilla_dom_CharacterDataImpl.cpp

@@ -101,13 +101,12 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_getData
     return NULL;
   }
 
-  char* cret = ret.ToNewCString();
+  const char* cret = ret.GetBuffer();
   jstring jret = env->NewStringUTF(cret);
   if (!jret) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("CharacterData.getData: NewStringUTF failed: %s\n", cret));
   }
-  delete[] cret;
 
   return jret;
 }
@@ -265,13 +264,12 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_CharacterDataImpl_substringData
     return NULL;
   }
 
-  char* cret = ret.ToNewCString();
+  const char* cret = ret.GetBuffer();
   jstring jret = env->NewStringUTF(cret);
   if (!jret) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("CharacterData.substringData: NewStringUTF failed: %s\n", cret));
   }
-  delete[] cret;
 
   return jret;
 }

java/dom/jni/org_mozilla_dom_DocumentTypeImpl.cpp

@@ -87,13 +87,12 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_DocumentTypeImpl_getName
     return NULL;
   }
 
-  char* cret = ret.ToNewCString();
+  const char* cret = ret.GetBuffer();
   jstring jret = env->NewStringUTF(cret);
   if (!jret) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("DocumentType.getName: NewStringUTF failed: %s\n", cret));
   }
-  delete[] cret;
 
   return jret;
 }

java/dom/jni/org_mozilla_dom_ElementImpl.cpp

@@ -56,14 +56,13 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getAttribute
     return NULL;
   }
 
-  char* cattr = attr.ToNewCString();
+  const char* cattr = attr.GetBuffer();
   jstring jattr = env->NewStringUTF(cattr);
   if (!jattr) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("Element.getAttribute: NewStringUTF failed (%s)\n", cattr));
     return NULL;
   }
-  delete[] cattr;
 
   return jattr;
 }
@@ -196,14 +195,13 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ElementImpl_getTagName
     return NULL;
   }
 
-  char* cTagName = tagName.ToNewCString();
+  const char* cTagName = tagName.GetBuffer();
   jstring jTagName = env->NewStringUTF(cTagName);
   if (!jTagName) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("Element.getTagName: NewStringUTF failed (%s)\n", cTagName));
     return NULL;
   }
-  delete[] cTagName;
 
   return jTagName;
 }

java/dom/jni/org_mozilla_dom_EntityImpl.cpp

@@ -44,14 +44,13 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getNotationName
     return NULL;
   }
 
-  char* cret = ret.ToNewCString();
+  const char* cret = ret.GetBuffer();
   jstring jret = env->NewStringUTF(cret);
   if (!jret) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("Entity.getNotationName: NewStringUTF failed (%s)\n", cret));
     return NULL;
   }
-  delete[] cret;
 
   return jret;
 }
@@ -80,14 +79,13 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getPublicId
     return NULL;
   }
 
-  char* cret = ret.ToNewCString();
+  const char* cret = ret.GetBuffer();
   jstring jret = env->NewStringUTF(cret);
   if (!jret) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("Entity.getPublicId: NewStringUTF failed (%s)\n", cret));
     return NULL;
   }
-  delete[] cret;
 
   return jret;
 }
@@ -116,14 +114,13 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_EntityImpl_getSystemId
     return NULL;
   }
 
-  char* cret = ret.ToNewCString();
+  const char* cret = ret.GetBuffer();
   jstring jret = env->NewStringUTF(cret);
   if (!jret) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("Entity.getSystemId: NewStringUTF failed (%s)\n", cret));
     return NULL;
   }
-  delete[] cret;
 
   return jret;
 }

java/dom/jni/org_mozilla_dom_NodeImpl.cpp

@@ -384,14 +384,13 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeName
     return NULL;
   }
 
-  char* cret = ret.ToNewCString();
+  const char* cret = ret.GetBuffer();
   jstring jret = env->NewStringUTF(cret);
   if (!jret) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("Node.getNodeName: NewStringUTF failed (%s)\n", cret));
     return NULL;
   }
-  delete[] cret;
 
   return jret;
 }
@@ -518,14 +517,13 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeValue
     return NULL;
   }
 
-  char* cret = ret.ToNewCString();
+  const char* cret = ret.GetBuffer();
   jstring jret = env->NewStringUTF(cret);
   if (!jret) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("Node.getNodeValue: NewStringUTF failed (%s)\n", cret));
     return NULL;
   }
-  delete[] cret;
 
   return jret;
 }

java/dom/jni/org_mozilla_dom_NotationImpl.cpp

@@ -44,14 +44,13 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NotationImpl_getPublicId
     return NULL;
   }
 
-  char* cret = ret.ToNewCString();
+  const char* cret = ret.GetBuffer();
   jstring jret = env->NewStringUTF(cret);
   if (!jret) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("Notation.getPublicId: NewStringUTF failed (%s)\n", cret));
     return NULL;
   }
-  delete[] cret;
 
   return jret;
 }
@@ -80,14 +79,13 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NotationImpl_getSystemId
     return NULL;
   }
 
-  char* cret = ret.ToNewCString();
+  const char* cret = ret.GetBuffer();
   jstring jret = env->NewStringUTF(cret);
   if (!jret) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("Notation.getSystemId: NewStringUTF failed (%s)\n", cret));
     return NULL;
   }
-  delete[] cret;
 
   return jret;
 }

java/dom/jni/org_mozilla_dom_ProcessingInstructionImpl.cpp

@@ -44,14 +44,13 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_getData
     return NULL;
   }
 
-  char* cret = ret.ToNewCString();
+  const char* cret = ret.GetBuffer();
   jstring jret = env->NewStringUTF(cret);
   if (!jret) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("ProcessingInstruction.getData: NewStringUTF failed (%s)\n", cret));
     return NULL;
   }
-  delete[] cret;
 
   return jret;
 }
@@ -80,14 +79,13 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_ProcessingInstructionImpl_getTarg
     return NULL;
   }
 
-  char* cret = ret.ToNewCString();
+  const char* cret = ret.GetBuffer();
   jstring jret = env->NewStringUTF(cret);
   if (!jret) {
     PR_LOG(JavaDOMGlobals::log, PR_LOG_ERROR, 
 	   ("ProcessingInstruction.getTarget: NewStringUTF failed (%s)\n", cret));
     return NULL;
   }
-  delete[] cret;
 
   return jret;
 }

java/dom/nsJavaDOMImpl.cpp

@@ -34,7 +34,7 @@ static void dump_document(nsIDOMDocument* dom, const char* urlSpec);
 static void dump_node(FILE* of, nsIDOMNode* node, int indent, 
 		      PRBool isMapNode);
 static void dump_map(FILE* of, nsIDOMNamedNodeMap* map, int indent);
-static char* strip_whitespace(char* input);
+static char* strip_whitespace(const char* input);
 static const char* describe_type(int type);
 #endif
 
@@ -444,9 +444,8 @@ NS_IMETHODIMP nsJavaDOMImpl::OnStatusURLLoad(nsIDocumentLoader* loader,
   jstring jURL = env->NewStringUTF(urlSpec);
   if (!jURL) return NS_ERROR_FAILURE;
 
-  char* cMsg = aMsg.ToNewCString();
+  const char* cMsg = aMsg.GetBuffer();
   jstring jMessage = env->NewStringUTF(cMsg);
-  delete[] cMsg;
   if (!jMessage) return NS_ERROR_FAILURE;
 
   nsIDOMDocument* domDoc = GetDocument(loader);
@@ -565,13 +564,12 @@ static void dump_node(FILE* of, nsIDOMNode* node, int indent,
   node->GetNodeValue(value);
   node->GetNodeType(&type);
 
-  char* cname = name.ToNewCString();
-  char* cvalue = value.ToNewCString();
+  const char* cname = name.GetBuffer();
+  const char* cvalue = value.GetBuffer();
   char* cnorm = strip_whitespace(cvalue);
   fprintf(of, "name=\"%s\" type=%s value=\"%s\"", 
 	  cname, describe_type(type), cnorm);
   delete[] cnorm;
-  delete[] cname;
 
   if (isMapNode) return;
 
@@ -619,13 +617,13 @@ static void dump_map(FILE* of, nsIDOMNamedNodeMap* map, int indent)
   }
 }
 
-static char* strip_whitespace(char* input)
+static char* strip_whitespace(const char* input)
 {
   int len = strlen(input);
   char* out = new char[len];
 
   char* op = out;
-  char* ip = input;
+  const char* ip = input;
   char c = ' ';
   char pc = ' ';
 
@@ -638,7 +636,6 @@ static char* strip_whitespace(char* input)
   }
   *op++ = 0;
 
-  delete[] input;
   return out;
 }