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

partial backout in an attempt to fix orange.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@242891 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dwitte%stanford.edu
2008-01-11 10:09:00 +00:00
parent 4c74c22a8d
commit 546ce140b5
12 changed files with 81 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/extensions/java/xpcom/tools/genifaces/GenerateJavaInterfaces.cpp
View File

@@ -416,8 +416,10 @@ public:
static const char kIIDDecl2[] = " =\n \"";
static const char kIIDDecl3[] = "\";\n\n";
nsIID* iid;
aIInfo->GetIIDShared(&iid);
nsIID* iid = nsnull;
aIInfo->GetInterfaceIID(&iid);
if (!iid)
return NS_ERROR_OUT_OF_MEMORY;
// create iid field name
nsCAutoString iid_name;
@@ -433,8 +435,9 @@ public:
ToUpperCase(iid_name);
// get iid string
char iid_str[NSID_LENGTH];
iid->ToProvidedString(iid_str);
char* iid_str = iid->ToString();
if (!iid_str)
return NS_ERROR_OUT_OF_MEMORY;
PRUint32 count;
nsresult rv = out->Write(kIIDDecl1, sizeof(kIIDDecl1) - 1, &count);
@@ -449,6 +452,8 @@ public:
NS_ENSURE_SUCCESS(rv, rv);
// cleanup
PR_Free(iid_str);
nsMemory::Free(iid);
return NS_OK;
}