From 876fc624df9728ee0feee26e1b31b53ed9ef3326 Mon Sep 17 00:00:00 2001 From: Dusan Durech Date: Sun, 12 Apr 2009 14:29:51 +0200 Subject: convert all name function from oldName to new_name --- src/server/highScore.c | 28 +++++------ src/server/highScore.h | 8 ++-- src/server/log.c | 10 ++-- src/server/log.h | 6 +-- src/server/publicServer.c | 106 +++++++++++++++++++++--------------------- src/server/publicServer.h | 12 ++--- src/server/serverConfigFile.c | 10 ++-- src/server/serverConfigFile.h | 6 +-- 8 files changed, 93 insertions(+), 93 deletions(-) (limited to 'src/server') diff --git a/src/server/highScore.c b/src/server/highScore.c index 89476ff..affd28f 100644 --- a/src/server/highScore.c +++ b/src/server/highScore.c @@ -11,16 +11,16 @@ static textFile_t *textFile; -void initHighScore(char *file) +void highScore_init(char *file) { int i; - textFile = loadTextFile(file); + textFile = textFile_load(file); if (textFile == NULL) { fprintf(stderr, _("I am unable to load: \"%s\"!\n"), file); fprintf(stderr, _("Creating: \"%s\"\n"), file); - textFile = newTextFile(file); + textFile = textFile_new(file); } else { DEBUG_MSG(_("Scorefile: \"%s\"\n"), file); @@ -33,13 +33,13 @@ void initHighScore(char *file) } for (i = 0; i < HIGHSCORE_MAX_PLAYERS; i++) { - addList(textFile->text, strdup("no_name 0")); + list_add(textFile->text, strdup("no_name 0")); } - saveTextFile(textFile); + textFile_save(textFile); } -int addPlayerInHighScore(char *name, int score) +int table_add(char *name, int score) { int i; @@ -59,10 +59,10 @@ int addPlayerInHighScore(char *name, int score) char new[STR_SIZE]; sprintf(new, "%s %d", name, score); - insList(textFile->text, i, strdup(new)); - delListItem(textFile->text, HIGHSCORE_MAX_PLAYERS, free); - //printTextFile(textFile); - saveTextFile(textFile); + list_ins(textFile->text, i, strdup(new)); + list_del_item(textFile->text, HIGHSCORE_MAX_PLAYERS, free); + //textFile_print(textFile); + textFile_save(textFile); return 0; } @@ -71,7 +71,7 @@ int addPlayerInHighScore(char *name, int score) return -1; } -char *getTableItem(int index) +char *highScore_get_table(int index) { if (textFile != NULL && index >= 0 && index < textFile->text->count) { return (char *) textFile->text->list[index]; @@ -80,10 +80,10 @@ char *getTableItem(int index) return NULL; } -void quitHighScore() +void highScore_quit() { if (textFile != NULL) { - saveTextFile(textFile); - destroyTextFile(textFile); + textFile_save(textFile); + textFile_destroy(textFile); } } diff --git a/src/server/highScore.h b/src/server/highScore.h index 8c3c141..7326d6d 100644 --- a/src/server/highScore.h +++ b/src/server/highScore.h @@ -5,9 +5,9 @@ # define HIGHSCORE_MAX_PLAYERS 100 -extern void initHighScore(char *file); -extern int addPlayerInHighScore(char *name, int score); -extern char *getTableItem(int index); -extern void quitHighScore(); +extern void highScore_init(char *file); +extern int table_add(char *name, int score); +extern char *highScore_get_table(int index); +extern void highScore_quit(); #endif diff --git a/src/server/log.c b/src/server/log.c index 67a25f8..fcfb6e0 100644 --- a/src/server/log.c +++ b/src/server/log.c @@ -11,7 +11,7 @@ static FILE *logFile; -int initLog(char *name) +int log_init(char *name) { logFile = fopen(name, "a"); @@ -22,12 +22,12 @@ int initLog(char *name) DEBUG_MSG(_("I use logfile: \"%s\")\n"), name); - addToLog(LOG_INF, "open log file"); + log_add(LOG_INF, "open log file"); return 0; } -void addToLog(int type, char *msg) +void log_add(int type, char *msg) { char str[STR_LOG_SIZE]; struct tm *tm_struct; @@ -65,8 +65,8 @@ void addToLog(int type, char *msg) fflush(logFile); } -void quitLog() +void log_quit() { - addToLog(LOG_INF, "close log file"); + log_add(LOG_INF, "close log file"); fclose(logFile); } diff --git a/src/server/log.h b/src/server/log.h index 01f2c8b..6b61529 100644 --- a/src/server/log.h +++ b/src/server/log.h @@ -8,8 +8,8 @@ # define LOG_WRN 3 # define LOG_ERR 4 -extern int initLog(char *name); -extern void addToLog(int type, char *msg); -extern void quitLog(); +extern int log_init(char *name); +extern void log_add(int type, char *msg); +extern void log_quit(); #endif diff --git a/src/server/publicServer.c b/src/server/publicServer.c index ccf044f..475c47d 100644 --- a/src/server/publicServer.c +++ b/src/server/publicServer.c @@ -47,13 +47,13 @@ extern int errno; #define __PACKED__ __attribute__ ((__packed__)) -void countRoundInc() +void word_inc_round() { } -char *getSetting(char *env, char *param, char *default_val) +char *publicServer_get_setting(char *env, char *param, char *default_val) { - return getParamElse(param, getServerConfigFileValue(env, default_val)); + return getParamElse(param, server_configFile_get_value(env, default_val)); } static int registerPublicServer() @@ -68,7 +68,7 @@ static int registerPublicServer() struct sockaddr_in server; char *master_server_ip; - master_server_ip = getIPFormDNS(NET_MASTER_SERVER_DOMAIN); + master_server_ip = gns_resolv(NET_MASTER_SERVER_DOMAIN); //printf("master_server_ip = %s\n", master_server_ip); @@ -161,7 +161,7 @@ static int registerPublicServer() register_head *head = (register_head *) str; head->cmd = 'p'; - head->port = atoi(getSetting("PORT4", "--port4", "6800")); + head->port = atoi(publicServer_get_setting("PORT4", "--port4", "6800")); head->ip = 0; // TODO /* send request for server list */ @@ -186,7 +186,7 @@ static int registerPublicServer() return 0; } -static int initPublicServerNetwork() +static int publicServer_initNetwork() { char ip4[STR_IP_SIZE]; char ip6[STR_IP_SIZE]; @@ -197,8 +197,8 @@ static int initPublicServerNetwork() ret = -1; - strcpy(ip4, getSetting("IP4", "--ip4", "none")); - strcpy(ip6, getSetting("IP6", "--ip6", "none")); + strcpy(ip4, publicServer_get_setting("IP4", "--ip4", "none")); + strcpy(ip6, publicServer_get_setting("IP6", "--ip6", "none")); p_ip4 = ip4; @@ -212,68 +212,68 @@ static int initPublicServerNetwork() p_ip6 = NULL; } - port4 = atoi(getSetting("PORT4", "--port4", "6800")); - port6 = atoi(getSetting("PORT6", "--port6", "6800")); + port4 = atoi(publicServer_get_setting("PORT4", "--port4", "6800")); + port6 = atoi(publicServer_get_setting("PORT6", "--port6", "6800")); //ret = initNetMulitplayerPublicServer(p_ip4, port4, p_ip6, port6); - ret = initNetMuliplayerForGameServer(p_ip4, port4, p_ip6, port6); + ret = netMultiplayer_init_for_game_server(p_ip4, port4, p_ip6, port6); return ret; } -static void loadArena() +static void load_arena() { - choice_arenaFile = getArenaFileFormNetName(getSetting("ARENA", "--arena", "FAGN")); + choice_arenaFile = arenaFile_get_file_format_net_name(publicServer_get_setting("ARENA", "--arena", "FAGN")); if (choice_arenaFile == NULL) { - fprintf(stderr, _("I dont load arena %s!\n"), getSetting("ARENA", "--arena", "FAGN")); + fprintf(stderr, _("I dont load arena %s!\n"), publicServer_get_setting("ARENA", "--arena", "FAGN")); exit(-1); } - arena = getArena(choice_arenaFile); + arena = arenaFile_get_arena(choice_arenaFile); - setCurrentArena(arena); + arena_set_current(arena); } -int initPublicServer() +int publicServer_init() { int ret; int i; - initListID(); - initModule(); - initArenaFile(); - initTux(); - initItem(); - initShot(); - initServerConfigFile(); + id_init_list(); + module_init(); + arenaFile_init(); + tux_init(); + item_init(); + shot_init(); + server_configFile_init(); - ret = initLog(getSetting("LOG_FILE", "--log-file", "/tmp/tuxanci-server.log")); + ret = log_init(publicServer_get_setting("LOG_FILE", "--log-file", "/tmp/tuxanci-server.log")); if (ret < 0) { fprintf(stderr, _("I was unable to open config file!\n")); return -1; } - initHighScore(getSetting("SCORE_FILE", "--score-file", "/tmp/highscore.txt")); + highScore_init(publicServer_get_setting("SCORE_FILE", "--score-file", "/tmp/highscore.txt")); - loadArena(); + load_arena(); - for (i = 0; i < atoi(getSetting("ITEM", "--item", "10")); i++) { - addNewItem(arena->spaceItem, ID_UNKNOWN); + for (i = 0; i < atoi(publicServer_get_setting("ITEM", "--item", "10")); i++) { + item_add_new_item(arena->spaceItem, ID_UNKNOWN); } isSignalEnd = FALSE; - ret = initPublicServerNetwork(); + ret = publicServer_initNetwork(); if (ret < 0) { printf(_("Unable to initialize network socket!\n")); return -1; } - setServerMaxClients(atoi (getSetting("MAX_CLIENTS", "--max-clients", "32"))); + server_set_max_clients(atoi (publicServer_get_setting("MAX_CLIENTS", "--max-clients", "32"))); if (registerPublicServer() < 0) { printf(_("Unable to contact MasterServer!)\n")); @@ -282,7 +282,7 @@ int initPublicServer() return 0; } -arenaFile_t *getChoiceArena() +arenaFile_t *choiceArena_get() { return choice_arenaFile; } @@ -292,26 +292,26 @@ void eventPublicServer() static my_time_t lastActive = 0; my_time_t interval; - eventNetMultiplayer(); + netMultiplayer_event(); if (isSignalEnd == TRUE) { - quitPublicServer(); + publicServer_quit(); } if (lastActive == 0) { - lastActive = getMyTime(); + lastActive = timer_get_current_time(); } - interval = getMyTime() - lastActive; + interval = timer_get_current_time() - lastActive; if (interval < 50) { return; } //printf("interval = %d\n", interval); - lastActive = getMyTime(); + lastActive = timer_get_current_time(); - eventArena(arena); + arena_event(arena); } void my_handler_quit(int n) @@ -321,36 +321,36 @@ void my_handler_quit(int n) isSignalEnd = TRUE; } -void quitPublicServer() +void publicServer_quit() { DEBUG_MSG(_("Quitting public server\n")); - quitNetMultiplayer(); - destroyArena(arena); + netMultiplayer_quit(); + arena_destroy(arena); - quitTux(); - quitItem(); - quitShot(); + tux_quit(); + item_quiy(); + shot_quit(); - quitArenaFile(); - quitServerConfigFile(); - quitModule(); - quitListID(); - quitHighScore(); - quitLog(); + arenaFile_quit(); + server_configFile_quit(); + module_quit(); + id_quit_list(); + highScore_quit(); + log_quit(); exit(0); } -int startPublicServer() +int publicServer_start() { #ifndef __WIN32__ signal(SIGINT, my_handler_quit); signal(SIGTERM, my_handler_quit); signal(SIGQUIT, my_handler_quit); #endif - if (initPublicServer() < 0) { - quitPublicServer(); + if (publicServer_init() < 0) { + publicServer_quit(); return -1; } diff --git a/src/server/publicServer.h b/src/server/publicServer.h index e5538b6..4a102a8 100644 --- a/src/server/publicServer.h +++ b/src/server/publicServer.h @@ -8,13 +8,13 @@ # define WORLD_COUNT_ROUND_UNLIMITED -1 -extern char *getSetting(char *env, char *param, char *default_val); -extern void countRoundInc(); -extern int initPublicServer(); -extern arenaFile_t *getChoiceArena(); +extern char *publicServer_get_setting(char *env, char *param, char *default_val); +extern void word_inc_round(); +extern int publicServer_init(); +extern arenaFile_t *choiceArena_get(); extern void eventPublicServer(); extern void my_handler_quit(int n); -extern void quitPublicServer(); -extern int startPublicServer(); +extern void publicServer_quit(); +extern int publicServer_start(); #endif diff --git a/src/server/serverConfigFile.c b/src/server/serverConfigFile.c index 0af58f9..e1331ab 100644 --- a/src/server/serverConfigFile.c +++ b/src/server/serverConfigFile.c @@ -32,7 +32,7 @@ static void prepareConfigFile(textFile_t * ts) } } -void initServerConfigFile() +void server_configFile_init() { char *configFile; @@ -40,7 +40,7 @@ void initServerConfigFile() printf(_("Loading configuration from: \"%s\"\n"), getParamElse("--config-file", SERVER_CONFIG)); - serverTextFile = loadTextFile(configFile); + serverTextFile = textFile_load(configFile); if (serverTextFile == NULL) { fprintf(stderr, @@ -68,7 +68,7 @@ static char *findValue(char *s) return NULL; } -char *getServerConfigFileValue(char *env, char *s) +char *server_configFile_get_value(char *env, char *s) { int i; int len; @@ -92,9 +92,9 @@ char *getServerConfigFileValue(char *env, char *s) return s; } -void quitServerConfigFile() +void server_configFile_quit() { if (serverTextFile != NULL) { - destroyTextFile(serverTextFile); + textFile_destroy(serverTextFile); } } diff --git a/src/server/serverConfigFile.h b/src/server/serverConfigFile.h index 221557b..4388df2 100644 --- a/src/server/serverConfigFile.h +++ b/src/server/serverConfigFile.h @@ -4,8 +4,8 @@ # define SERVER_CONFIG_FILE_H -extern void initServerConfigFile(); -extern char *getServerConfigFileValue(char *env, char *s); -extern void quitServerConfigFile(); +extern void server_configFile_init(); +extern char *server_configFile_get_value(char *env, char *s); +extern void server_configFile_quit(); #endif -- cgit v1.2.3