From 72d097103424677102aac4f366feb3212edbed84 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 17 Dec 2007 01:38:15 +0100 Subject: [PATCH] mshtml: Remove not used argument of nsACString_GetData. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 6 +++--- dlls/mshtml/nsio.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4e76924b972..fed9f66b1fa 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -408,7 +408,7 @@ void nsfree(void*); void nsACString_Init(nsACString*,const char*); void nsACString_SetData(nsACString*,const char*); -PRUint32 nsACString_GetData(const nsACString*,const char**,PRBool*); +PRUint32 nsACString_GetData(const nsACString*,const char**); void nsACString_Finish(nsACString*); void nsAString_Init(nsAString*,const PRUnichar*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fc8ccbfb4b2..5c8c1ecb4a1 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -472,9 +472,9 @@ void nsACString_SetData(nsACString *str, const char *data) NS_CStringSetData(str, data, PR_UINT32_MAX); } -PRUint32 nsACString_GetData(const nsACString *str, const char **data, PRBool *termited) +PRUint32 nsACString_GetData(const nsACString *str, const char **data) { - return NS_CStringGetData(str, data, termited); + return NS_CStringGetData(str, data, NULL); } void nsACString_Finish(nsACString *str) @@ -1104,7 +1104,7 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener nsACString_Init(&spec_str, NULL); nsIURI_GetSpec(aURI, &spec_str); - nsACString_GetData(&spec_str, &spec, NULL); + nsACString_GetData(&spec_str, &spec); TRACE("(%p)->(%p(%s) %p)\n", This, aURI, debugstr_a(spec), _retval); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 72ad814a1cb..2568b35973a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -505,7 +505,7 @@ static nsresult NSAPI nsChannel_GetContentCharset(nsIHttpChannel *iface, if(This->channel) { nsresult nsres = nsIChannel_GetContentCharset(This->channel, aContentCharset); const char *ch; - nsACString_GetData(aContentCharset, &ch, NULL); + nsACString_GetData(aContentCharset, &ch); return nsres; } @@ -589,7 +589,7 @@ static BOOL do_load_from_moniker_hack(nsChannel *This) if(NS_SUCCEEDED(nsres)) { const char *scheme; - nsACString_GetData(&scheme_str, &scheme, NULL); + nsACString_GetData(&scheme_str, &scheme); ret = !strcmp(scheme, "wine"); } @@ -1101,7 +1101,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, nsIInputStream_Release(This->post_data_stream); if(aContentType) { - nsACString_GetData(aContentType, &content_type, NULL); + nsACString_GetData(aContentType, &content_type); if(*content_type) FIXME("Unsupported aContentType argument: %s\n", debugstr_a(content_type)); } @@ -1982,7 +1982,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * BOOL is_wine_uri = FALSE; nsresult nsres; - nsACString_GetData(aSpec, &spec, NULL); + nsACString_GetData(aSpec, &spec); TRACE("(%p(%s) %s %p %p)\n", aSpec, debugstr_a(spec), debugstr_a(aOriginCharset), aBaseURI, _retval); @@ -2003,7 +2003,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * nsres = nsIURI_GetSpec(aBaseURI, &base_uri_str); if(NS_SUCCEEDED(nsres)) { - nsACString_GetData(&base_uri_str, &base_uri, NULL); + nsACString_GetData(&base_uri_str, &base_uri); TRACE("base_uri=%s\n", debugstr_a(base_uri)); }else { ERR("GetSpec failed: %08x\n", nsres);