From 311f371d27bff8a93effeea2ce85acb340c942ef Mon Sep 17 00:00:00 2001 From: "disttsc%bart.nl" Date: Sun, 25 Mar 2001 23:07:49 +0000 Subject: [PATCH] Some string, IID and CID cleaning in singsign.cpp, wallet.cpp, bug=73341, r=morse, sr=shaver git-svn-id: svn://10.0.0.236/trunk@90395 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/wallet/src/singsign.cpp | 60 +++++++++++----------- mozilla/extensions/wallet/src/singsign.h | 2 +- mozilla/extensions/wallet/src/wallet.cpp | 59 ++++++++------------- 3 files changed, 50 insertions(+), 71 deletions(-) diff --git a/mozilla/extensions/wallet/src/singsign.cpp b/mozilla/extensions/wallet/src/singsign.cpp index 913380131c8..3f27511e38d 100644 --- a/mozilla/extensions/wallet/src/singsign.cpp +++ b/mozilla/extensions/wallet/src/singsign.cpp @@ -50,11 +50,6 @@ #include "nsXPIDLString.h" #include "nsReadableUtils.h" -static NS_DEFINE_IID(kIPrefServiceIID, NS_IPREF_IID); -static NS_DEFINE_IID(kPrefServiceCID, NS_PREF_CID); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); -static NS_DEFINE_CID(kStandardUrlCID, NS_STANDARDURL_CID); - // Currently the default is on, so we don't need the code to prompt the // user if the default is off. #undef WALLET_PASSWORDMANAGER_DEFAULT_IS_OFF @@ -145,7 +140,7 @@ si_unlock_signon_list(void) { PUBLIC void SI_RegisterCallback(const char* domain, PrefChangedFunc callback, void* instance_data) { nsresult ret; - nsCOMPtr pPrefService = do_GetService(kPrefServiceCID, &ret); + nsCOMPtr pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret); if (!NS_FAILED(ret)) { ret = pPrefService->RegisterCallback(domain, callback, instance_data); } @@ -154,7 +149,7 @@ SI_RegisterCallback(const char* domain, PrefChangedFunc callback, void* instance PUBLIC void SI_UnregisterCallback(const char* domain, PrefChangedFunc callback, void* instance_data) { nsresult ret; - nsCOMPtr pPrefService = do_GetService(kPrefServiceCID, &ret); + nsCOMPtr pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret); if (!NS_FAILED(ret)) { ret = pPrefService->UnregisterCallback(domain, callback, instance_data); } @@ -163,7 +158,7 @@ SI_UnregisterCallback(const char* domain, PrefChangedFunc callback, void* instan PUBLIC void SI_SetBoolPref(const char * prefname, PRBool prefvalue) { nsresult ret; - nsCOMPtr pPrefService = do_GetService(kPrefServiceCID, &ret); + nsCOMPtr pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret); if (!NS_FAILED(ret)) { ret = pPrefService->SetBoolPref(prefname, prefvalue); if (!NS_FAILED(ret)) { @@ -176,7 +171,7 @@ PUBLIC PRBool SI_GetBoolPref(const char * prefname, PRBool defaultvalue) { nsresult ret; PRBool prefvalue = defaultvalue; - nsCOMPtr pPrefService = do_GetService(kPrefServiceCID, &ret); + nsCOMPtr pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret); if (!NS_FAILED(ret)) { ret = pPrefService->GetBoolPref(prefname, &prefvalue); } @@ -189,7 +184,7 @@ SI_SetCharPref(const char * prefname, const char * prefvalue) { return; /* otherwise the SetCharPref routine called below will crash */ } nsresult ret; - nsCOMPtr pPrefService = do_GetService(kPrefServiceCID, &ret); + nsCOMPtr pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret); if (!NS_FAILED(ret)) { ret = pPrefService->SetCharPref(prefname, prefvalue); if (!NS_FAILED(ret)) { @@ -201,7 +196,7 @@ SI_SetCharPref(const char * prefname, const char * prefvalue) { PUBLIC void SI_GetCharPref(const char * prefname, char** aPrefvalue) { nsresult ret; - nsCOMPtr pPrefService = do_GetService(kPrefServiceCID, &ret); + nsCOMPtr pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret); if (!NS_FAILED(ret)) { ret = pPrefService->CopyCharPref(prefname, aPrefvalue); if (NS_FAILED(ret)) { @@ -215,7 +210,7 @@ SI_GetCharPref(const char * prefname, char** aPrefvalue) { PUBLIC void SI_GetLocalizedUnicharPref(const char * prefname, PRUnichar** aPrefvalue) { nsresult ret; - nsCOMPtr pPrefService = do_GetService(kPrefServiceCID, &ret); + nsCOMPtr pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret); if (!NS_FAILED(ret)) { ret = pPrefService->GetLocalizedUnicharPref(prefname, aPrefvalue); if (NS_FAILED(ret)) { @@ -608,7 +603,7 @@ si_Randomize(nsString& password) { PRIntervalTime randomNumber; int i; const char * hexDigits = "0123456789AbCdEf"; - if (password == NS_ConvertToString("********")) { + if (password.Equals(NS_LITERAL_STRING("********"))) { randomNumber = PR_IntervalNow(); for (i=0; i<8; i++) { password.SetCharAt(hexDigits[randomNumber%16], i); @@ -1830,7 +1825,7 @@ si_SaveSignonDataLocked() { /* write out the format revision number */ - si_WriteLine(strm, NS_ConvertToString(HEADER_VERSION)); + si_WriteLine(strm, NS_ConvertASCIItoUCS2(HEADER_VERSION)); /* format for next part of file shall be: * passwordRealm -- first url/username on reject list @@ -1846,10 +1841,10 @@ si_SaveSignonDataLocked() { PRInt32 rejectCount = LIST_COUNT(si_reject_list); for (PRInt32 i=0; iElementAt(i)); - si_WriteLine(strm, NS_ConvertToString(reject->passwordRealm)); + si_WriteLine(strm, NS_ConvertASCIItoUCS2(reject->passwordRealm)); } } - si_WriteLine(strm, NS_ConvertToString(".")); + si_WriteLine(strm, NS_ConvertASCIItoUCS2(".")); /* format for cached logins shall be: * url LINEBREAK {name LINEBREAK value LINEBREAK}* . LINEBREAK @@ -1867,7 +1862,7 @@ si_SaveSignonDataLocked() { for (PRInt32 i3=0; i3signonUser_list.ElementAt(i3)); si_WriteLine - (strm, NS_ConvertToString(url->passwordRealm)); + (strm, NS_ConvertASCIItoUCS2(url->passwordRealm)); /* write out each data node of the user node */ PRInt32 dataCount = user->signonData_list.Count(); @@ -1879,7 +1874,7 @@ si_SaveSignonDataLocked() { si_WriteLine(strm, nsAutoString(data->name)); si_WriteLine(strm, nsAutoString(data->value)); } - si_WriteLine(strm, NS_ConvertToString(".")); + si_WriteLine(strm, NS_ConvertASCIItoUCS2(".")); } } } @@ -2243,10 +2238,10 @@ si_RestoreOldSignonDataFromBrowser /* get the data from previous time this URL was visited */ si_lock_signon_list(); if (username.Length() != 0) { - user = si_GetSpecificUser(passwordRealm, username, NS_ConvertToString(USERNAMEFIELD)); + user = si_GetSpecificUser(passwordRealm, username, NS_ConvertASCIItoUCS2(USERNAMEFIELD)); } else { si_UserHasBeenSelected = PR_FALSE; - user = si_GetUser(dialog, passwordRealm, pickFirstUser, NS_ConvertToString(USERNAMEFIELD)); + user = si_GetUser(dialog, passwordRealm, pickFirstUser, NS_ConvertASCIItoUCS2(USERNAMEFIELD)); } if (!user) { /* leave original username and password from caller unchanged */ @@ -2557,19 +2552,22 @@ SI_InSequence(const nsString& sequence, PRInt32 number) } PUBLIC void -SI_FindValueInArgs(const nsString& results, const nsString& name, nsString& value) +SI_FindValueInArgs(const nsAReadableString& results, const nsAReadableString& name, nsAWritableString& value) { /* note: name must start and end with a vertical bar */ - PRInt32 start, length; - start = results.Find(name); - PR_ASSERT(start >= 0); - if (start < 0) { + nsReadingIterator start, end, barPos; + results.BeginReading(start); + results.EndReading(end); + + FindInReadable(name, start, end); + PR_ASSERT(start != end); + if (start == end) { return; } - start += name.Length(); /* get passed the |name| part */ - length = results.FindChar('|', PR_FALSE,start) - start; - results.Mid(value, start, length); - return; + start.advance(name.Length()); /* get past the |name| part */ + barPos = start; + FindCharInReadable(PRUnichar('|'), barPos, end); + value = Substring(start, barPos); } PUBLIC void @@ -2591,7 +2589,7 @@ SINGSIGN_SignonViewerReturn(const nsString& results) { /* * step backwards through all users and delete those that are in the sequence */ nsAutoString gone; - SI_FindValueInArgs(results, NS_ConvertToString("|goneS|"), gone); + SI_FindValueInArgs(results, NS_LITERAL_STRING("|goneS|"), gone); PRInt32 urlCount = LIST_COUNT(si_signon_list); while (urlCount>0) { urlCount--; @@ -2617,7 +2615,7 @@ SINGSIGN_SignonViewerReturn(const nsString& results) { si_SaveSignonDataLocked(); /* step backwards through all rejects and delete those that are in the sequence */ - SI_FindValueInArgs(results, NS_ConvertToString("|goneR|"), gone); + SI_FindValueInArgs(results, NS_LITERAL_STRING("|goneR|"), gone); si_lock_signon_list(); PRInt32 rejectCount = LIST_COUNT(si_reject_list); while (rejectCount>0) { diff --git a/mozilla/extensions/wallet/src/singsign.h b/mozilla/extensions/wallet/src/singsign.h index 9d4e0bafc69..faa9f0153e1 100644 --- a/mozilla/extensions/wallet/src/singsign.h +++ b/mozilla/extensions/wallet/src/singsign.h @@ -111,7 +111,7 @@ extern PRBool SI_InSequence(const nsString& sequence, int number); extern void -SI_FindValueInArgs(const nsString& results, const nsString& name, nsString& value); +SI_FindValueInArgs(const nsAReadableString& results, const nsAReadableString& name, nsAWritableString& value); extern void SI_DeleteAll(); diff --git a/mozilla/extensions/wallet/src/wallet.cpp b/mozilla/extensions/wallet/src/wallet.cpp index c03a744530f..ffd24fc96ae 100644 --- a/mozilla/extensions/wallet/src/wallet.cpp +++ b/mozilla/extensions/wallet/src/wallet.cpp @@ -63,20 +63,10 @@ #define morseAssert(x,y) 0 #endif -static NS_DEFINE_IID(kIDOMHTMLDocumentIID, NS_IDOMHTMLDOCUMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLFormElementIID, NS_IDOMHTMLFORMELEMENT_IID); -static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID); static NS_DEFINE_IID(kIDOMHTMLOptionElementIID, NS_IDOMHTMLOPTIONELEMENT_IID); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); - static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID); -static NS_DEFINE_IID(kIStringBundleServiceIID, NS_ISTRINGBUNDLESERVICE_IID); -static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - #include "prlong.h" #include "prinrval.h" @@ -467,7 +457,7 @@ Wallet_Localize(char* genericString) { nsAutoString v; /* create a bundle for the localization */ - nsCOMPtr pStringService = do_GetService(kStringBundleServiceCID, &ret); + nsCOMPtr pStringService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &ret); if (NS_FAILED(ret)) { #ifdef DEBUG printf("cannot get string service\n"); @@ -1879,17 +1869,16 @@ wallet_GetSelectIndex( nsresult result; PRUint32 length; selectElement->GetLength(&length); - nsIDOMNSHTMLOptionCollection * options; - result = selectElement->GetOptions(&options); + nsCOMPtr options; + result = selectElement->GetOptions(getter_AddRefs(options)); if ((NS_SUCCEEDED(result)) && (nsnull != options)) { PRUint32 numOptions; options->GetLength(&numOptions); for (PRUint32 optionX = 0; optionX < numOptions; optionX++) { - nsIDOMNode* optionNode = nsnull; - options->Item(optionX, &optionNode); - if (nsnull != optionNode) { - nsIDOMHTMLOptionElement* optionElement = nsnull; - result = optionNode->QueryInterface(kIDOMHTMLOptionElementIID, (void**)&optionElement); + nsCOMPtr optionNode; + options->Item(optionX, getter_AddRefs(optionNode)); + if (optionNode) { + nsCOMPtr optionElement(do_QueryInterface(optionNode, &result)); if ((NS_SUCCEEDED(result)) && (nsnull != optionElement)) { nsAutoString optionValue; nsAutoString optionText; @@ -1904,12 +1893,9 @@ wallet_GetSelectIndex( index = optionX; return 0; } - NS_RELEASE(optionElement); } - NS_RELEASE(optionNode); } } - NS_RELEASE(options); } return -1; } @@ -1958,8 +1944,7 @@ wallet_StepForwardOrBack * visible element. That would include such things as type="button", type="submit" etc. The * only thing it would exclude is type="hidden". */ - nsIDOMHTMLInputElement* inputElement; - result = elementNode->QueryInterface(kIDOMHTMLInputElementIID, (void**)&inputElement); + nsCOMPtr inputElement(do_QueryInterface(elementNode, &result)); if ((NS_SUCCEEDED(result)) && (inputElement)) { nsAutoString type; result = inputElement->GetType(type); @@ -1979,8 +1964,7 @@ wallet_StepForwardOrBack } } } else { - nsIDOMHTMLSelectElement* selectElement; - result = elementNode->QueryInterface(kIDOMHTMLSelectElementIID, (void**)&selectElement); + nsCOMPtr selectElement(do_QueryInterface(elementNode, &result)); if ((NS_SUCCEEDED(result)) && (selectElement)) { atInputOrSelect = PR_TRUE; return; @@ -2406,7 +2390,7 @@ wallet_GetPrefills( nsresult result; /* get prefills for input element */ - result = elementNode->QueryInterface(kIDOMHTMLInputElementIID, (void**)&inputElement); + result = elementNode->QueryInterface(NS_GET_IID(nsIDOMHTMLInputElement), (void**)&inputElement); if ((NS_SUCCEEDED(result)) && (nsnull != inputElement)) { nsAutoString type; result = inputElement->GetType(type); @@ -2470,7 +2454,7 @@ if (schema.Length()) { } /* get prefills for dropdown list */ - result = elementNode->QueryInterface(kIDOMHTMLSelectElementIID, (void**)&selectElement); + result = elementNode->QueryInterface(NS_GET_IID(nsIDOMHTMLSelectElement), (void**)&selectElement); if ((NS_SUCCEEDED(result)) && (nsnull != selectElement)) { nsAutoString field; result = selectElement->GetName(field); @@ -2749,8 +2733,7 @@ Wallet_SignonViewerReturn(const nsString& results) /* step through all nopreviews and delete those that are in the sequence */ { - nsAutoString temp1; temp1.AssignWithConversion("|goneP|"); - SI_FindValueInArgs(results, temp1, gone); + SI_FindValueInArgs(results, NS_LITERAL_STRING("|goneP|"), gone); } PRInt32 count = LIST_COUNT(wallet_URL_list); while (count>0) { @@ -2767,8 +2750,7 @@ Wallet_SignonViewerReturn(const nsString& results) /* step through all nocaptures and delete those that are in the sequence */ { - nsAutoString temp2; temp2.AssignWithConversion("|goneC|"); - SI_FindValueInArgs(results, temp2, gone); + SI_FindValueInArgs(results, NS_LITERAL_STRING("|goneC|"), gone); } PRInt32 count2 = LIST_COUNT(wallet_URL_list); while (count2>0) { @@ -3205,8 +3187,8 @@ WLLT_InitReencryptCallback(nsIDOMWindowInternal* window) { PRIVATE void wallet_DecodeVerticalBars(nsString& s) { - s.ReplaceSubstring(NS_ConvertASCIItoUCS2("^2"), NS_ConvertASCIItoUCS2("|")); - s.ReplaceSubstring(NS_ConvertASCIItoUCS2("^1"), NS_ConvertASCIItoUCS2("^")); + s.ReplaceSubstring(NS_LITERAL_STRING("^2"), NS_LITERAL_STRING("|")); + s.ReplaceSubstring(NS_LITERAL_STRING("^1"), NS_LITERAL_STRING("^")); } /* @@ -3222,10 +3204,10 @@ WLLT_PrefillReturn(const nsString& results) nsAutoString next; /* get values that are in environment variables */ - SI_FindValueInArgs(results, NS_ConvertToString("|fillins|"), fillins); - SI_FindValueInArgs(results, NS_ConvertToString("|list|"), listAsAscii); - SI_FindValueInArgs(results, NS_ConvertToString("|skip|"), skip); - SI_FindValueInArgs(results, NS_ConvertToString("|url|"), urlName); + SI_FindValueInArgs(results, NS_LITERAL_STRING("|fillins|"), fillins); + SI_FindValueInArgs(results, NS_LITERAL_STRING("|list|"), listAsAscii); + SI_FindValueInArgs(results, NS_LITERAL_STRING("|skip|"), skip); + SI_FindValueInArgs(results, NS_LITERAL_STRING("|url|"), urlName); wallet_DecodeVerticalBars(fillins); wallet_DecodeVerticalBars(urlName); @@ -3622,8 +3604,7 @@ wallet_CaptureSelectElement(nsIDOMNode* elementNode, nsIDocument* doc) { nsIDOMNode* optionNode = nsnull; options->Item(selectedIndex, &optionNode); if (nsnull != optionNode) { - nsIDOMHTMLOptionElement* optionElement = nsnull; - result = optionNode->QueryInterface(kIDOMHTMLOptionElementIID, (void**)&optionElement); + nsCOMPtr optionElement(do_QueryInterface(optionNode, &result)); if ((NS_SUCCEEDED(result)) && (nsnull != optionElement)) { nsAutoString optionValue; nsAutoString optionText;