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

Fix for bug 80108. Fix PREF_DeleteBranch so it doesn't append a "." if one is already there. r=chipc, sr=alecf, a=dbaron.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@96735 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bnesse%netscape.com 2001-06-08 20:35:01 +00:00
parent 0d82929ca0
commit dafc550c45
2 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/modules/libpref/src/prefapi.c
View File

@ -1069,15 +1069,31 @@ pref_DeleteItem(PLHashEntry *he, int i, void *arg)
PrefResult
PREF_DeleteBranch(const char *branch_name)
{
char* branch_dot = PR_smprintf("%s.", branch_name);
if (!branch_dot)
return PREF_OUT_OF_MEMORY;
char* branch_dot;
int len = (int)PL_strlen(branch_name);
if (!gHashTable)
return PREF_NOT_INITIALIZED;
/* The following check insures that if the branch name already has a "."
* at the end, we don't end up with a "..". This fixes an incompatibility
* between nsIPref, which needs the period added, and nsIPrefBranch which
* does not. When nsIPref goes away this function should be fixed to
* never add the period at all.
*/
if ((len > 1) && (branch_name[len - 1] == '.'))
branch_dot = (char *)branch_name;
else
{
branch_dot = PR_smprintf("%s.", branch_name);
if (!branch_dot)
return PREF_OUT_OF_MEMORY;
}
PR_HashTableEnumerateEntries(gHashTable, pref_DeleteItem, (void*) branch_dot);
PR_Free(branch_dot);
if (branch_dot != branch_name)
PR_Free(branch_dot);
return PREF_NOERROR;
}

24
mozilla/modules/libpref/src/prefapi.cpp
View File

@ -1069,15 +1069,31 @@ pref_DeleteItem(PLHashEntry *he, int i, void *arg)
PrefResult
PREF_DeleteBranch(const char *branch_name)
{
char* branch_dot = PR_smprintf("%s.", branch_name);
if (!branch_dot)
return PREF_OUT_OF_MEMORY;
char* branch_dot;
int len = (int)PL_strlen(branch_name);
if (!gHashTable)
return PREF_NOT_INITIALIZED;
/* The following check insures that if the branch name already has a "."
* at the end, we don't end up with a "..". This fixes an incompatibility
* between nsIPref, which needs the period added, and nsIPrefBranch which
* does not. When nsIPref goes away this function should be fixed to
* never add the period at all.
*/
if ((len > 1) && (branch_name[len - 1] == '.'))
branch_dot = (char *)branch_name;
else
{
branch_dot = PR_smprintf("%s.", branch_name);
if (!branch_dot)
return PREF_OUT_OF_MEMORY;
}
PR_HashTableEnumerateEntries(gHashTable, pref_DeleteItem, (void*) branch_dot);
PR_Free(branch_dot);
if (branch_dot != branch_name)
PR_Free(branch_dot);
return PREF_NOERROR;
}