mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r12847) -Cleanup: Identing and variable scope

release/0.7
peter1138 2008-04-23 11:57:58 +00:00
parent 39a715f1f3
commit fff763b5ce
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/fios.cpp
View File

@ -108,50 +108,50 @@ StringID FiosGetDescText(const char **path, uint32 *total_free)
* @return a string if we have given a file as a target, otherwise NULL */ * @return a string if we have given a file as a target, otherwise NULL */
char *FiosBrowseTo(const FiosItem *item) char *FiosBrowseTo(const FiosItem *item)
{ {
char *s;
char *path = _fios_path; char *path = _fios_path;
switch (item->type) { switch (item->type) {
#if defined(WINCE) #if defined(WINCE)
case FIOS_TYPE_DRIVE: sprintf(path, PATHSEP ""); break; case FIOS_TYPE_DRIVE: sprintf(path, PATHSEP ""); break;
#elif defined(WIN32) || defined(__OS2__) #elif defined(WIN32) || defined(__OS2__)
case FIOS_TYPE_DRIVE: sprintf(path, "%c:" PATHSEP, item->title[0]); break; case FIOS_TYPE_DRIVE: sprintf(path, "%c:" PATHSEP, item->title[0]); break;
#endif #endif
case FIOS_TYPE_PARENT: case FIOS_TYPE_PARENT: {
/* Check for possible NULL ptr (not required for UNIXes, but AmigaOS-alikes) */ /* Check for possible NULL ptr (not required for UNIXes, but AmigaOS-alikes) */
s = strrchr(path, PATHSEPCHAR); char *s = strrchr(path, PATHSEPCHAR);
if (s != NULL && s != path) { if (s != NULL && s != path) {
s[0] = '\0'; // Remove last path separator character, so we can go up one level. s[0] = '\0'; // Remove last path separator character, so we can go up one level.
} }
s = strrchr(path, PATHSEPCHAR); s = strrchr(path, PATHSEPCHAR);
if (s != NULL) s[1] = '\0'; // go up a directory if (s != NULL) s[1] = '\0'; // go up a directory
#if defined(__MORPHOS__) || defined(__AMIGAOS__) #if defined(__MORPHOS__) || defined(__AMIGAOS__)
/* On MorphOS or AmigaOS paths look like: "Volume:directory/subdirectory" */ /* On MorphOS or AmigaOS paths look like: "Volume:directory/subdirectory" */
else if ((s = strrchr(path, ':')) != NULL) s[1] = '\0'; else if ((s = strrchr(path, ':')) != NULL) s[1] = '\0';
#endif #endif
break; break;
}
case FIOS_TYPE_DIR: case FIOS_TYPE_DIR:
strcat(path, item->name); strcat(path, item->name);
strcat(path, PATHSEP); strcat(path, PATHSEP);
break; break;
case FIOS_TYPE_DIRECT: case FIOS_TYPE_DIRECT:
sprintf(path, "%s", item->name); sprintf(path, "%s", item->name);
break; break;
case FIOS_TYPE_FILE: case FIOS_TYPE_FILE:
case FIOS_TYPE_OLDFILE: case FIOS_TYPE_OLDFILE:
case FIOS_TYPE_SCENARIO: case FIOS_TYPE_SCENARIO:
case FIOS_TYPE_OLD_SCENARIO: case FIOS_TYPE_OLD_SCENARIO:
case FIOS_TYPE_PNG: case FIOS_TYPE_PNG:
case FIOS_TYPE_BMP: case FIOS_TYPE_BMP:
{ {
static char str_buffr[512]; static char str_buffr[512];
snprintf(str_buffr, lengthof(str_buffr), "%s%s", path, item->name); snprintf(str_buffr, lengthof(str_buffr), "%s%s", path, item->name);
return str_buffr; return str_buffr;
} }
} }
return NULL; return NULL;