121508 - StringStream/nsIParser API cleanup

Status: RESOLVED FIXED

(Core :: XPCOM, defect, P2)

Description

[Alec Flett]

I was fixing up some string stuff, and I ran into some string cleanups that make
some future work I'm doing a whole lot easier. Basically:

nsIParser::SetDocumentCharset/nsIParser::GetDocumentCharset - changed to take
nsAString&'s rather than nsString&'s, so we can use NS_LITERAL_STRING

NS_New[C]StringStream - changed first parameter to be an nsIInputStream** to
avoid an extra query interface (all 19 callers were expecting an nsIInputStream)
and changed the second parameter (The string) to be an nsAString.

these changes, while basicaly unrelated, came together in nsRDFXMLParser.cpp
patch forthcoming

Looking for an r=dougt, sr=jaggernaut.

Comment 1

[Alec Flett]

argh, adding dougt and jaggernaut to CC for reviews...

Comment 2

[Alec Flett]

Attachment: update APIs to be nsAString friendly

the callees to nsIParser don't need to be updated because they were all passing
in nsString's - it was just RDF that was actually passing in an nsString that
originated as a const char*

Comment 3

[Doug Turner (:dougt)]

Comment on attachment 66184 [details] [diff] [review]
update APIs to be nsAString friendly

boy that sure does makes things simple.  Assuming that going to nsAString is
the right thing, r=dougt

Comment 4

[Alec Flett]

oops, reassign to me.

Comment 5

[jag (Peter Annema)]

Comment on attachment 66184 [details] [diff] [review]
update APIs to be nsAString friendly

>Index: netwerk/base/public/nsNetUtil.h
>===================================================================
>RCS file: /cvsroot/mozilla/netwerk/base/public/nsNetUtil.h,v
>retrieving revision 1.46
>diff -u -r1.46 nsNetUtil.h
>--- netwerk/base/public/nsNetUtil.h	8 Jan 2002 06:32:34 -0000	1.46
>+++ netwerk/base/public/nsNetUtil.h	23 Jan 2002 22:37:41 -0000
>@@ -274,10 +274,7 @@
> 
>     // otherwise, create a string stream for the data
>     nsCOMPtr<nsISupports> sup;

No need for |sup| anymore, it seems.

>-    rv = NS_NewCStringInputStream(getter_AddRefs(sup), nsCAutoString(data));
>-    if (NS_FAILED(rv)) return rv;
>-
>-    return CallQueryInterface(sup, result);
>+    return NS_NewCStringInputStream(result, nsCAutoString(data));

One can use nsDependentCString here, n'est-ce pas?

>Index: netwerk/streamconv/test/Converters.cpp
>===================================================================
>RCS file: /cvsroot/mozilla/netwerk/streamconv/test/Converters.cpp,v
>retrieving revision 1.19
>diff -u -r1.19 Converters.cpp
>--- netwerk/streamconv/test/Converters.cpp	29 Sep 2001 08:27:49 -0000	1.19
>+++ netwerk/streamconv/test/Converters.cpp	23 Jan 2002 22:37:42 -0000
>@@ -53,15 +53,8 @@
> 
>     nsString convDataStr;
>     convDataStr.AssignWithConversion(buf);

...

>+    return NS_NewStringInputStream(_retval, convDataStr);


Is this AssignWithConversion needed or could you use a CStringInputStream?

Comment 6

[Alec Flett]

Attachment: picky, picky...

I guess I missed those minor ones. fixed.

Comment 7

[Alec Flett]

Comment on attachment 66279 [details] [diff] [review]
picky, picky...

copying over dougt's r=

Comment 8

[Johnny Stenback (:jst)]

Comment on attachment 66279 [details] [diff] [review]
picky, picky...

sr=jst

Comment 9

[Alec Flett]

ok, fix is in. thanks folks