wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1176159 (part 1) - Remove pref_SaveTypes. r=bsmedberg.

Browse Source 
Because SAVE_ALL is the only value ever used.
This commit is contained in:
Nicholas Nethercote 2015-06-18 16:44:35 -07:00
parent ec9df1cf53
commit 38c2aad78a
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/libpref/Preferences.cpp
View File

@ -960,7 +960,6 @@ Preferences::WritePrefFile(nsIFile* aFile)
memset(valueArray, 0, gHashTable->EntryCount() * sizeof(char*)); memset(valueArray, 0, gHashTable->EntryCount() * sizeof(char*));
pref_saveArgs saveArgs; pref_saveArgs saveArgs;
saveArgs.prefArray = valueArray; saveArgs.prefArray = valueArray;
saveArgs.saveTypes = SAVE_ALL;
// get the lines that we're supposed to be writing to the file // get the lines that we're supposed to be writing to the file
PL_DHashTableEnumerate(gHashTable, pref_savePref, &saveArgs); PL_DHashTableEnumerate(gHashTable, pref_savePref, &saveArgs);

9
modules/libpref/prefapi.cpp
View File

@ -343,13 +343,8 @@ pref_savePref(PLDHashTable *table, PLDHashEntryHdr *heh, uint32_t i, void *arg)
pref->flags & PREF_STICKY_DEFAULT)) { pref->flags & PREF_STICKY_DEFAULT)) {
sourcePref = &pref->userPref; sourcePref = &pref->userPref;
} else { } else {
if (argData->saveTypes == SAVE_ALL_AND_DEFAULTS) { // do not save default prefs that haven't changed
prefPrefix.AssignLiteral("pref(\""); return PL_DHASH_NEXT;
sourcePref = &pref->defaultPref;
}
else
// do not save default prefs that haven't changed
return PL_DHASH_NEXT;
} }
// strings are in quotes! // strings are in quotes!

3
modules/libpref/prefapi_private_data.h
View File

@ -19,12 +19,9 @@ class PrefSetting;
} }
} }
enum pref_SaveTypes { SAVE_NONSHARED, SAVE_SHARED, SAVE_ALL, SAVE_ALL_AND_DEFAULTS };
// Passed as the arg to pref_savePref // Passed as the arg to pref_savePref
struct pref_saveArgs { struct pref_saveArgs {
char **prefArray; char **prefArray;
pref_SaveTypes saveTypes;
}; };
PLDHashOperator PLDHashOperator