gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r24145) -Cleanup: Switch coding style.

Browse Source
This commit is contained in:
michi_cc 2012-04-17 19:44:59 +00:00
parent f6d0bf6109
commit 6c8a16f36e
1 changed files with 161 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/settings.cpp
View File

@ -225,14 +225,17 @@ static bool LoadIntList(const char *str, void *array, int nelems, VarType type)
case SLE_VAR_U8: case SLE_VAR_U8:
for (i = 0; i != nitems; i++) ((byte*)array)[i] = items[i]; for (i = 0; i != nitems; i++) ((byte*)array)[i] = items[i];
break; break;
case SLE_VAR_I16: case SLE_VAR_I16:
case SLE_VAR_U16: case SLE_VAR_U16:
for (i = 0; i != nitems; i++) ((uint16*)array)[i] = items[i]; for (i = 0; i != nitems; i++) ((uint16*)array)[i] = items[i];
break; break;
case SLE_VAR_I32: case SLE_VAR_I32:
case SLE_VAR_U32: case SLE_VAR_U32:
for (i = 0; i != nitems; i++) ((uint32*)array)[i] = items[i]; for (i = 0; i != nitems; i++) ((uint32*)array)[i] = items[i];
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
@ -339,6 +342,7 @@ static void MakeManyOfMany(char *buf, const char *last, const char *many, uint32
static const void *StringToVal(const SettingDescBase *desc, const char *orig_str) static const void *StringToVal(const SettingDescBase *desc, const char *orig_str)
{ {
const char *str = orig_str == NULL ? "" : orig_str; const char *str = orig_str == NULL ? "" : orig_str;
switch (desc->cmd) { switch (desc->cmd) {
case SDT_NUMX: { case SDT_NUMX: {
char *end; char *end;
@ -349,6 +353,7 @@ static const void *StringToVal(const SettingDescBase *desc, const char *orig_str
} }
return (void*)val; return (void*)val;
} }
case SDT_ONEOFMANY: { case SDT_ONEOFMANY: {
size_t r = LookupOneOfMany(desc->many, str); size_t r = LookupOneOfMany(desc->many, str);
/* if the first attempt of conversion from string to the appropriate value fails, /* if the first attempt of conversion from string to the appropriate value fails,
@ -361,6 +366,7 @@ static const void *StringToVal(const SettingDescBase *desc, const char *orig_str
ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL); ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL);
return 0; return 0;
} }
case SDT_MANYOFMANY: { case SDT_MANYOFMANY: {
size_t r = LookupManyOfMany(desc->many, str); size_t r = LookupManyOfMany(desc->many, str);
if (r != (size_t)-1) return (void*)r; if (r != (size_t)-1) return (void*)r;
@ -369,6 +375,7 @@ static const void *StringToVal(const SettingDescBase *desc, const char *orig_str
ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL); ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_VALUE, WL_CRITICAL);
return NULL; return NULL;
} }
case SDT_BOOLX: case SDT_BOOLX:
if (strcmp(str, "true") == 0 || strcmp(str, "on") == 0 || strcmp(str, "1") == 0) return (void*)true; if (strcmp(str, "true") == 0 || strcmp(str, "on") == 0 || strcmp(str, "1") == 0) return (void*)true;
if (strcmp(str, "false") == 0 || strcmp(str, "off") == 0 || strcmp(str, "0") == 0) return (void*)false; if (strcmp(str, "false") == 0 || strcmp(str, "off") == 0 || strcmp(str, "0") == 0) return (void*)false;
@ -502,12 +509,15 @@ static void IniLoadSettings(IniFile *ini, const SettingDesc *sd, const char *grp
case SLE_VAR_STRBQ: case SLE_VAR_STRBQ:
if (p != NULL) ttd_strlcpy((char*)ptr, (const char*)p, sld->length); if (p != NULL) ttd_strlcpy((char*)ptr, (const char*)p, sld->length);
break; break;
case SLE_VAR_STR: case SLE_VAR_STR:
case SLE_VAR_STRQ: case SLE_VAR_STRQ:
free(*(char**)ptr); free(*(char**)ptr);
*(char**)ptr = p == NULL ? NULL : strdup((const char*)p); *(char**)ptr = p == NULL ? NULL : strdup((const char*)p);
break; break;
case SLE_VAR_CHAR: if (p != NULL) *(char *)ptr = *(const char *)p; break; case SLE_VAR_CHAR: if (p != NULL) *(char *)ptr = *(const char *)p; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
break; break;
@ -584,21 +594,26 @@ static void IniSaveSettings(IniFile *ini, const SettingDesc *sd, const char *grp
case SLE_VAR_BL: case SLE_VAR_BL:
if (*(bool*)ptr == (p != NULL)) continue; if (*(bool*)ptr == (p != NULL)) continue;
break; break;
case SLE_VAR_I8: case SLE_VAR_I8:
case SLE_VAR_U8: case SLE_VAR_U8:
if (*(byte*)ptr == (byte)(size_t)p) continue; if (*(byte*)ptr == (byte)(size_t)p) continue;
break; break;
case SLE_VAR_I16: case SLE_VAR_I16:
case SLE_VAR_U16: case SLE_VAR_U16:
if (*(uint16*)ptr == (uint16)(size_t)p) continue; if (*(uint16*)ptr == (uint16)(size_t)p) continue;
break; break;
case SLE_VAR_I32: case SLE_VAR_I32:
case SLE_VAR_U32: case SLE_VAR_U32:
if (*(uint32*)ptr == (uint32)(size_t)p) continue; if (*(uint32*)ptr == (uint32)(size_t)p) continue;
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
break; break;
default: break; // Assume the other types are always changed default: break; // Assume the other types are always changed
} }
} }
@ -626,6 +641,7 @@ static void IniSaveSettings(IniFile *ini, const SettingDesc *sd, const char *grp
case SLE_VAR_STRB: strecpy(buf, (char*)ptr, lastof(buf)); break; case SLE_VAR_STRB: strecpy(buf, (char*)ptr, lastof(buf)); break;
case SLE_VAR_STRBQ:seprintf(buf, lastof(buf), "\"%s\"", (char*)ptr); break; case SLE_VAR_STRBQ:seprintf(buf, lastof(buf), "\"%s\"", (char*)ptr); break;
case SLE_VAR_STR: strecpy(buf, *(char**)ptr, lastof(buf)); break; case SLE_VAR_STR: strecpy(buf, *(char**)ptr, lastof(buf)); break;
case SLE_VAR_STRQ: case SLE_VAR_STRQ:
if (*(char**)ptr == NULL) { if (*(char**)ptr == NULL) {
buf[0] = '\0'; buf[0] = '\0';
@ -633,6 +649,7 @@ static void IniSaveSettings(IniFile *ini, const SettingDesc *sd, const char *grp
seprintf(buf, lastof(buf), "\"%s\"", *(char**)ptr); seprintf(buf, lastof(buf), "\"%s\"", *(char**)ptr);
} }
break; break;
case SLE_VAR_CHAR: buf[0] = *(char*)ptr; buf[1] = '\0'; break; case SLE_VAR_CHAR: buf[0] = *(char*)ptr; buf[1] = '\0'; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
@ -641,6 +658,7 @@ static void IniSaveSettings(IniFile *ini, const SettingDesc *sd, const char *grp
case SDT_INTLIST: case SDT_INTLIST:
MakeIntList(buf, lastof(buf), ptr, sld->length, GetVarMemType(sld->conv)); MakeIntList(buf, lastof(buf), ptr, sld->length, GetVarMemType(sld->conv));
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }