ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Use NS_CStringContainerInit2 in nsACString_Init.

Browse Source
This commit is contained in:
Jacek Caban 2010-04-22 17:48:39 +02:00 committed by Alexandre Julliard
parent 64271d5207
commit 033bb8a2f9
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/mshtml/nsembed.c
View File

@ -56,7 +56,6 @@ static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*);
static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**); static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**);
static nsresult (*NS_StringContainerInit2)(nsStringContainer*,const PRUnichar*,PRUint32,PRUint32); static nsresult (*NS_StringContainerInit2)(nsStringContainer*,const PRUnichar*,PRUint32,PRUint32);
static nsresult (*NS_CStringContainerInit2)(nsCStringContainer*,const char*,PRUint32,PRUint32); static nsresult (*NS_CStringContainerInit2)(nsCStringContainer*,const char*,PRUint32,PRUint32);
static nsresult (*NS_CStringContainerInit)(nsCStringContainer*);
static nsresult (*NS_StringContainerFinish)(nsStringContainer*); static nsresult (*NS_StringContainerFinish)(nsStringContainer*);
static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*); static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*);
static nsresult (*NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32); static nsresult (*NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32);
@ -182,9 +181,8 @@ static BOOL load_xpcom(const PRUnichar *gre_path)
NS_DLSYM(NS_InitXPCOM2); NS_DLSYM(NS_InitXPCOM2);
NS_DLSYM(NS_ShutdownXPCOM); NS_DLSYM(NS_ShutdownXPCOM);
NS_DLSYM(NS_GetComponentRegistrar); NS_DLSYM(NS_GetComponentRegistrar);
NS_DLSYM(NS_CStringContainerInit2);
NS_DLSYM(NS_StringContainerInit2); NS_DLSYM(NS_StringContainerInit2);
NS_DLSYM(NS_CStringContainerInit); NS_DLSYM(NS_CStringContainerInit2);
NS_DLSYM(NS_StringContainerFinish); NS_DLSYM(NS_StringContainerFinish);
NS_DLSYM(NS_CStringContainerFinish); NS_DLSYM(NS_CStringContainerFinish);
NS_DLSYM(NS_StringSetData); NS_DLSYM(NS_StringSetData);
@ -522,11 +520,9 @@ void nsfree(void *mem)
nsIMemory_Free(nsmem, mem); nsIMemory_Free(nsmem, mem);
} }
static void nsACString_Init(nsACString *str, const char *data) static BOOL nsACString_Init(nsACString *str, const char *data)
{ {
NS_CStringContainerInit(str); return NS_SUCCEEDED(NS_CStringContainerInit2(str, data, PR_UINT32_MAX, 0));
if(data)
nsACString_SetData(str, data);
} }
/* /*