diff options
author | darkvater <darkvater@openttd.org> | 2004-09-12 21:49:38 +0000 |
---|---|---|
committer | darkvater <darkvater@openttd.org> | 2004-09-12 21:49:38 +0000 |
commit | e295e46e3eccd58626ce2b02aab24b96c025636b (patch) | |
tree | 849dacad3729ee4bbd27669505a1932ca301592d /settings.c | |
parent | 1b498bca57457a5f46cc43baef225687e312692b (diff) | |
download | openttd-e295e46e3eccd58626ce2b02aab24b96c025636b.tar.xz |
(svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron)
-CodeLayout: Remove trailing spaces and Windows linebreaks
Diffstat (limited to 'settings.c')
-rw-r--r-- | settings.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/settings.c b/settings.c index 6a0823d46..596fb333a 100644 --- a/settings.c +++ b/settings.c @@ -325,9 +325,9 @@ static void ini_free(IniFile *ini) struct SettingDesc { const char *name; int flags; - void *def; + const void *def; void *ptr; - void *b; + const void *b; }; @@ -493,7 +493,7 @@ static void make_manyofmany(char *buf, const char *many, uint32 x) *buf = 0; } -static void *string_to_val(const SettingDesc *desc, const char *str) +static const void *string_to_val(const SettingDesc *desc, const char *str) { unsigned long val; char *end; @@ -532,11 +532,11 @@ static void *string_to_val(const SettingDesc *desc, const char *str) return NULL; } -static void load_setting_desc(IniFile *ini, const SettingDesc *desc, void *grpname, void *base) +static void load_setting_desc(IniFile *ini, const SettingDesc *desc, const void *grpname, void *base) { IniGroup *group_def = ini_getgroup(ini, grpname, -1), *group; IniItem *item; - void *p; + const void *p; void *ptr; for (;desc->name;desc++) { @@ -603,11 +603,12 @@ static void load_setting_desc(IniFile *ini, const SettingDesc *desc, void *grpna } } -static void save_setting_desc(IniFile *ini, const SettingDesc *desc, void *grpname, void *base) +static void save_setting_desc(IniFile *ini, const SettingDesc *desc, const void *grpname, void *base) { IniGroup *group_def = NULL, *group; IniItem *item; - void *p, *ptr; + const void *p; + void *ptr; int i = 0; char buf[512]; // setting buffer const char *s; @@ -883,7 +884,7 @@ static const SettingDesc patch_settings[] = { {NULL, 0, NULL, NULL, NULL} }; -typedef void SettingDescProc(IniFile *ini, const SettingDesc *desc, void *grpname, void *base); +typedef void SettingDescProc(IniFile *ini, const SettingDesc *desc, const void *grpname, void *base); static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc) { |