Fix bustage from bug 744077 - use nullptr instead of nsnull. a=bustage-fix
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 21 Aug 2012 14:28:17 +0100
changeset 12556 6bcd1eea7663182566b0674cb3cc1001773c2f9a
parent 12555 cbfc7d94b03da78e02052e585a2f149ead87dcbb
child 12557 43bbc725bd6a14661ccdd656cd8c62f29cb6bb47
push id644
push userbugzilla@standard8.plus.com
push dateTue, 21 Aug 2012 13:29:49 +0000
treeherdercomm-beta@6bcd1eea7663 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs744077
Fix bustage from bug 744077 - use nullptr instead of nsnull. a=bustage-fix
mailnews/mime/src/mimemoz2.cpp
--- a/mailnews/mime/src/mimemoz2.cpp
+++ b/mailnews/mime/src/mimemoz2.cpp
@@ -160,17 +160,17 @@ ProcessBodyAsAttachment(MimeObject *obj,
   if (obj->options->missing_parts)
     id_imap = mime_imap_part_address (obj);
 
   tmp->m_isDownloaded = !id_imap;
 
   if (! id)
   {
     delete [] *data;
-    *data = nullptr;
+    *data = nsnull;
     PR_FREEIF(id_imap);
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
   if (obj->options && obj->options->url)
   {
     const char  *url = obj->options->url;
     nsresult    rv;
@@ -185,17 +185,17 @@ ProcessBodyAsAttachment(MimeObject *obj,
       // This is just a normal MIME part as usual.
       tmpURL = mime_set_url_part(url, id, true);
       rv = nsMimeNewURI(getter_AddRefs(tmp->m_url), tmpURL, nsnull);
     }
 
     if (!tmp->m_url || NS_FAILED(rv))
     {
       delete [] *data;
-      *data = nullptr;
+      *data = nsnull;
       PR_FREEIF(id);
       PR_FREEIF(id_imap);
       return NS_ERROR_OUT_OF_MEMORY;
     }
   }
   PR_FREEIF(id);
   PR_FREEIF(id_imap);
   PR_FREEIF(tmpURL);