summaryrefslogtreecommitdiff
path: root/src/common/mapindex.c
diff options
context:
space:
mode:
authorgreenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-11-25 21:20:43 +0000
committergreenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-11-25 21:20:43 +0000
commitb11bf6e1604097711291265f927e79e8f2af5c54 (patch)
tree6eac67dfe94b2cef4e48f59c1bf448a321ce24cd /src/common/mapindex.c
parentd9c5c4784a0abc43fb9e01f365a0d8b3a15a0692 (diff)
downloadhercules-b11bf6e1604097711291265f927e79e8f2af5c54.tar.gz
hercules-b11bf6e1604097711291265f927e79e8f2af5c54.tar.bz2
hercules-b11bf6e1604097711291265f927e79e8f2af5c54.tar.xz
hercules-b11bf6e1604097711291265f927e79e8f2af5c54.zip
Applied AStyle code formating as discussed on tid:74602.
Removed /SAFESEH option from MSVC11 projects. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16968 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/mapindex.c')
-rw-r--r--src/common/mapindex.c251
1 files changed, 124 insertions, 127 deletions
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index d46047833..62d14590e 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -12,7 +12,7 @@
#include <stdlib.h>
struct _indexes {
- char name[MAP_NAME_LENGTH]; //Stores map name
+ char name[MAP_NAME_LENGTH]; //Stores map name
} indexes[MAX_MAPINDEX];
int max_index = 0;
@@ -23,161 +23,158 @@ char mapindex_cfgfile[80] = "db/map_index.txt";
/// Retrieves the map name from 'string' (removing .gat extension if present).
/// Result gets placed either into 'buf' or in a static local buffer.
-const char* mapindex_getmapname(const char* string, char* output)
+const char *mapindex_getmapname(const char *string, char *output)
{
- static char buf[MAP_NAME_LENGTH];
- char* dest = (output != NULL) ? output : buf;
-
- size_t len = strnlen(string, MAP_NAME_LENGTH_EXT);
- if (len == MAP_NAME_LENGTH_EXT) {
- ShowWarning("(mapindex_normalize_name) Map name '%*s' is too long!\n", 2*MAP_NAME_LENGTH_EXT, string);
- len--;
- }
- if (len >= 4 && stricmp(&string[len-4], ".gat") == 0)
- len -= 4; // strip .gat extension
-
- len = min(len, MAP_NAME_LENGTH-1);
- strncpy(dest, string, len+1);
- memset(&dest[len], '\0', MAP_NAME_LENGTH-len);
-
- return dest;
+ static char buf[MAP_NAME_LENGTH];
+ char *dest = (output != NULL) ? output : buf;
+
+ size_t len = strnlen(string, MAP_NAME_LENGTH_EXT);
+ if (len == MAP_NAME_LENGTH_EXT) {
+ ShowWarning("(mapindex_normalize_name) Map name '%*s' is too long!\n", 2*MAP_NAME_LENGTH_EXT, string);
+ len--;
+ }
+ if (len >= 4 && stricmp(&string[len-4], ".gat") == 0)
+ len -= 4; // strip .gat extension
+
+ len = min(len, MAP_NAME_LENGTH-1);
+ strncpy(dest, string, len+1);
+ memset(&dest[len], '\0', MAP_NAME_LENGTH-len);
+
+ return dest;
}
/// Retrieves the map name from 'string' (adding .gat extension if not already present).
/// Result gets placed either into 'buf' or in a static local buffer.
-const char* mapindex_getmapname_ext(const char* string, char* output)
+const char *mapindex_getmapname_ext(const char *string, char *output)
{
- static char buf[MAP_NAME_LENGTH_EXT];
- char* dest = (output != NULL) ? output : buf;
+ static char buf[MAP_NAME_LENGTH_EXT];
+ char *dest = (output != NULL) ? output : buf;
- size_t len;
+ size_t len;
- strcpy(buf,string);
- sscanf(string,"%*[^#]%*[#]%s",buf);
+ strcpy(buf,string);
+ sscanf(string,"%*[^#]%*[#]%s",buf);
- len = safestrnlen(buf, MAP_NAME_LENGTH);
+ len = safestrnlen(buf, MAP_NAME_LENGTH);
- if (len == MAP_NAME_LENGTH) {
- ShowWarning("(mapindex_normalize_name) Map name '%*s' is too long!\n", 2*MAP_NAME_LENGTH, buf);
- len--;
- }
- strncpy(dest, buf, len+1);
+ if (len == MAP_NAME_LENGTH) {
+ ShowWarning("(mapindex_normalize_name) Map name '%*s' is too long!\n", 2*MAP_NAME_LENGTH, buf);
+ len--;
+ }
+ strncpy(dest, buf, len+1);
- if (len < 4 || stricmp(&dest[len-4], ".gat") != 0) {
- strcpy(&dest[len], ".gat");
- len += 4; // add .gat extension
- }
+ if (len < 4 || stricmp(&dest[len-4], ".gat") != 0) {
+ strcpy(&dest[len], ".gat");
+ len += 4; // add .gat extension
+ }
- memset(&dest[len], '\0', MAP_NAME_LENGTH_EXT-len);
-
- return dest;
+ memset(&dest[len], '\0', MAP_NAME_LENGTH_EXT-len);
+
+ return dest;
}
/// Adds a map to the specified index
/// Returns 1 if successful, 0 oherwise
-int mapindex_addmap(int index, const char* name)
+int mapindex_addmap(int index, const char *name)
{
- char map_name[MAP_NAME_LENGTH];
-
- if (index == -1){
- for (index = 1; index < max_index; index++)
- {
- //if (strcmp(indexes[index].name,"#CLEARED#")==0)
- if (indexes[index].name[0] == '\0')
- break;
- }
- }
-
- if (index < 0 || index >= MAX_MAPINDEX) {
- ShowError("(mapindex_add) Map index (%d) for \"%s\" out of range (max is %d)\n", index, name, MAX_MAPINDEX);
- return 0;
- }
-
- mapindex_getmapname(name, map_name);
-
- if (map_name[0] == '\0') {
- ShowError("(mapindex_add) Cannot add maps with no name.\n");
- return 0;
- }
-
- if (strlen(map_name) >= MAP_NAME_LENGTH) {
- ShowError("(mapindex_add) Map name %s is too long. Maps are limited to %d characters.\n", map_name, MAP_NAME_LENGTH);
- return 0;
- }
-
- if (mapindex_exists(index))
- ShowWarning("(mapindex_add) Overriding index %d: map \"%s\" -> \"%s\"\n", index, indexes[index].name, map_name);
-
- safestrncpy(indexes[index].name, map_name, MAP_NAME_LENGTH);
- if (max_index <= index)
- max_index = index+1;
-
- return index;
+ char map_name[MAP_NAME_LENGTH];
+
+ if (index == -1) {
+ for (index = 1; index < max_index; index++) {
+ //if (strcmp(indexes[index].name,"#CLEARED#")==0)
+ if (indexes[index].name[0] == '\0')
+ break;
+ }
+ }
+
+ if (index < 0 || index >= MAX_MAPINDEX) {
+ ShowError("(mapindex_add) Map index (%d) for \"%s\" out of range (max is %d)\n", index, name, MAX_MAPINDEX);
+ return 0;
+ }
+
+ mapindex_getmapname(name, map_name);
+
+ if (map_name[0] == '\0') {
+ ShowError("(mapindex_add) Cannot add maps with no name.\n");
+ return 0;
+ }
+
+ if (strlen(map_name) >= MAP_NAME_LENGTH) {
+ ShowError("(mapindex_add) Map name %s is too long. Maps are limited to %d characters.\n", map_name, MAP_NAME_LENGTH);
+ return 0;
+ }
+
+ if (mapindex_exists(index))
+ ShowWarning("(mapindex_add) Overriding index %d: map \"%s\" -> \"%s\"\n", index, indexes[index].name, map_name);
+
+ safestrncpy(indexes[index].name, map_name, MAP_NAME_LENGTH);
+ if (max_index <= index)
+ max_index = index+1;
+
+ return index;
}
-unsigned short mapindex_name2id(const char* name)
+unsigned short mapindex_name2id(const char *name)
{
- //TODO: Perhaps use a db to speed this up? [Skotlex]
- int i;
-
- char map_name[MAP_NAME_LENGTH];
- mapindex_getmapname(name, map_name);
-
- for (i = 1; i < max_index; i++)
- {
- if (strcmpi(indexes[i].name,map_name)==0)
- return i;
- }
- ShowDebug("mapindex_name2id: Map \"%s\" not found in index list!\n", map_name);
- return 0;
+ //TODO: Perhaps use a db to speed this up? [Skotlex]
+ int i;
+
+ char map_name[MAP_NAME_LENGTH];
+ mapindex_getmapname(name, map_name);
+
+ for (i = 1; i < max_index; i++) {
+ if (strcmpi(indexes[i].name,map_name)==0)
+ return i;
+ }
+ ShowDebug("mapindex_name2id: Map \"%s\" not found in index list!\n", map_name);
+ return 0;
}
-const char* mapindex_id2name(unsigned short id)
+const char *mapindex_id2name(unsigned short id)
{
- if (id > MAX_MAPINDEX || !mapindex_exists(id)) {
- ShowDebug("mapindex_id2name: Requested name for non-existant map index [%d] in cache.\n", id);
- return indexes[0].name; // dummy empty string so that the callee doesn't crash
- }
- return indexes[id].name;
+ if (id > MAX_MAPINDEX || !mapindex_exists(id)) {
+ ShowDebug("mapindex_id2name: Requested name for non-existant map index [%d] in cache.\n", id);
+ return indexes[0].name; // dummy empty string so that the callee doesn't crash
+ }
+ return indexes[id].name;
}
void mapindex_init(void)
{
- FILE *fp;
- char line[1024];
- int last_index = -1;
- int index;
- char map_name[1024];
-
- memset (&indexes, 0, sizeof (indexes));
- fp=fopen(mapindex_cfgfile,"r");
- if(fp==NULL){
- ShowFatalError("Unable to read mapindex config file %s!\n", mapindex_cfgfile);
- exit(EXIT_FAILURE); //Server can't really run without this file.
- }
- while(fgets(line, sizeof(line), fp))
- {
- if(line[0] == '/' && line[1] == '/')
- continue;
-
- switch (sscanf(line, "%1023s\t%d", map_name, &index))
- {
- case 1: //Map with no ID given, auto-assign
- index = last_index+1;
- case 2: //Map with ID given
- mapindex_addmap(index,map_name);
- break;
- default:
- continue;
- }
- last_index = index;
- }
- fclose(fp);
+ FILE *fp;
+ char line[1024];
+ int last_index = -1;
+ int index;
+ char map_name[1024];
+
+ memset(&indexes, 0, sizeof(indexes));
+ fp=fopen(mapindex_cfgfile,"r");
+ if (fp==NULL) {
+ ShowFatalError("Unable to read mapindex config file %s!\n", mapindex_cfgfile);
+ exit(EXIT_FAILURE); //Server can't really run without this file.
+ }
+ while (fgets(line, sizeof(line), fp)) {
+ if (line[0] == '/' && line[1] == '/')
+ continue;
+
+ switch (sscanf(line, "%1023s\t%d", map_name, &index)) {
+ case 1: //Map with no ID given, auto-assign
+ index = last_index+1;
+ case 2: //Map with ID given
+ mapindex_addmap(index,map_name);
+ break;
+ default:
+ continue;
+ }
+ last_index = index;
+ }
+ fclose(fp);
}
-int mapindex_removemap(int index){
- indexes[index].name[0] = '\0';
- return 0;
+int mapindex_removemap(int index)
+{
+ indexes[index].name[0] = '\0';
+ return 0;
}
void mapindex_final(void)