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

use default prefs.js if someone cause PREF_ API before initializing it

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@24179 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hshaw%netscape.com 1999-03-15 21:38:06 +00:00
parent f4cf6c562b
commit 6c9b13a66e
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -953,6 +953,14 @@ pref_CompareStrings (const void *v1, const void *v2)
return strcmp(s1, s2);
}
PR_IMPLEMENT(PRBool)
pref_useDefaultPrefFile(void)
{
return PREF_Init("prefs.js");
}
/* LI_STUFF
this is new. clients should use the old PREF_SavePrefFile or new PREF_SaveLIPrefFile.
This is called by them and does the right thing.
@ -1131,7 +1139,7 @@ PrefResult pref_GetCharPref(const char *pref_name, char * return_buffer, int * l
PrefNode* pref;
if (!m_HashTable)
if (!m_HashTable && !pref_useDefaultPrefFile())
return PREF_NOT_INITIALIZED;
pref = (PrefNode*) PR_HashTableLookup(m_HashTable, pref_name);
@ -1164,7 +1172,7 @@ PrefResult pref_CopyCharPref(const char *pref_name, char ** return_buffer, PRBoo
char* stringVal;
PrefNode* pref;
if (!m_HashTable)
if (!m_HashTable && !pref_useDefaultPrefFile())
return PREF_NOT_INITIALIZED;
pref = (PrefNode*) PR_HashTableLookup(m_HashTable, pref_name);
@ -1188,7 +1196,7 @@ PrefResult pref_GetIntPref(const char *pref_name,int32 * return_int, PRBool get_
PrefResult result = PREF_ERROR;
PrefNode* pref;
if (!m_HashTable)
if (!m_HashTable && !pref_useDefaultPrefFile())
return PREF_NOT_INITIALIZED;
pref = (PrefNode*) PR_HashTableLookup(m_HashTable, pref_name);
@ -1207,7 +1215,7 @@ PrefResult pref_GetBoolPref(const char *pref_name, XP_Bool * return_value, PRBoo
PrefResult result = PREF_ERROR;
PrefNode* pref;
if (!m_HashTable)
if (!m_HashTable && !pref_useDefaultPrefFile())
return PREF_NOT_INITIALIZED;
pref = (PrefNode*) PR_HashTableLookup(m_HashTable, pref_name);
@ -1691,7 +1699,7 @@ PrefResult pref_HashPref(const char *key, PrefValue value, PrefType type, PrefAc
PrefNode* pref;
PrefResult result = PREF_OK;
if (!m_HashTable)
if (!m_HashTable && !pref_useDefaultPrefFile())
return PREF_NOT_INITIALIZED;
pref = (PrefNode*) PR_HashTableLookup(m_HashTable, key);

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

@ -953,6 +953,14 @@ pref_CompareStrings (const void *v1, const void *v2)
return strcmp(s1, s2);
}
PR_IMPLEMENT(PRBool)
pref_useDefaultPrefFile(void)
{
return PREF_Init("prefs.js");
}
/* LI_STUFF
this is new. clients should use the old PREF_SavePrefFile or new PREF_SaveLIPrefFile.
This is called by them and does the right thing.
@ -1131,7 +1139,7 @@ PrefResult pref_GetCharPref(const char *pref_name, char * return_buffer, int * l
PrefNode* pref;
if (!m_HashTable)
if (!m_HashTable && !pref_useDefaultPrefFile())
return PREF_NOT_INITIALIZED;
pref = (PrefNode*) PR_HashTableLookup(m_HashTable, pref_name);
@ -1164,7 +1172,7 @@ PrefResult pref_CopyCharPref(const char *pref_name, char ** return_buffer, PRBoo
char* stringVal;
PrefNode* pref;
if (!m_HashTable)
if (!m_HashTable && !pref_useDefaultPrefFile())
return PREF_NOT_INITIALIZED;
pref = (PrefNode*) PR_HashTableLookup(m_HashTable, pref_name);
@ -1188,7 +1196,7 @@ PrefResult pref_GetIntPref(const char *pref_name,int32 * return_int, PRBool get_
PrefResult result = PREF_ERROR;
PrefNode* pref;
if (!m_HashTable)
if (!m_HashTable && !pref_useDefaultPrefFile())
return PREF_NOT_INITIALIZED;
pref = (PrefNode*) PR_HashTableLookup(m_HashTable, pref_name);
@ -1207,7 +1215,7 @@ PrefResult pref_GetBoolPref(const char *pref_name, XP_Bool * return_value, PRBoo
PrefResult result = PREF_ERROR;
PrefNode* pref;
if (!m_HashTable)
if (!m_HashTable && !pref_useDefaultPrefFile())
return PREF_NOT_INITIALIZED;
pref = (PrefNode*) PR_HashTableLookup(m_HashTable, pref_name);
@ -1691,7 +1699,7 @@ PrefResult pref_HashPref(const char *key, PrefValue value, PrefType type, PrefAc
PrefNode* pref;
PrefResult result = PREF_OK;
if (!m_HashTable)
if (!m_HashTable && !pref_useDefaultPrefFile())
return PREF_NOT_INITIALIZED;
pref = (PrefNode*) PR_HashTableLookup(m_HashTable, key);