diff --git a/helmetctl.c b/helmetctl.c index 46d1dcb..78d6f00 100644 --- a/helmetctl.c +++ b/helmetctl.c @@ -28,33 +28,34 @@ int main(void) { int util_init(void) { - logger_dprintf("server init"); + logger_dprintf("server init"); return 0; } int util_config(void) { - logger_dprintf("server config"); + logger_dprintf("server config"); - tconfig_t tconfig; - tconfig_init(&tconfig); + tconfig_t tconfig; - char* logpath = NULL; - tconfig_bind(&tconfig, TCONF_STR, "logpath", &logpath); - ssize_t rsize = tconfig_read(&tconfig, "helmet.conf"); + tconfig_init(&tconfig); - int res = tconfig_parse(&tconfig); - MASSERT(res == -1); + char* logpath = NULL; - tconfig_destroy(&tconfig); - logger_dprintf("logpath = %s", logpath); + tconfig_bind(&tconfig, TCONF_STR, "logpath", &logpath); + ssize_t rsize = tconfig_read(&tconfig, "helmet.conf"); + + int res = tconfig_parse(&tconfig); + + MASSERT(res == -1); + + tconfig_destroy(&tconfig); + logger_dprintf("logpath = %s", logpath); return 0; } int util_run(void) { - logger_dprintf("server start"); + logger_dprintf("server start"); return 0; } - - diff --git a/helmetd.c b/helmetd.c index 12c01d4..a184311 100644 --- a/helmetd.c +++ b/helmetd.c @@ -23,29 +23,32 @@ int main(void) { -int _main(int argc, char **argv) { - (void)argc; - (void)argv; +int _main(int argc, char** argv) { + (void)argc; + (void)argv; - tconfig_t tconfig; - tconfig_init(&tconfig); + tconfig_t tconfig; - int intkey = 0; - char* strkey = NULL; + tconfig_init(&tconfig); - tconfig_bind(&tconfig, TCONF_INT, "intkey", &intkey); - tconfig_bind(&tconfig, TCONF_STR, "strkey", &strkey); + int intkey = 0; + char* strkey = NULL; - ssize_t rsize = tconfig_read(&tconfig, "helmet.conf"); - printf("%ld\n", rsize); - MASSERT(rsize > 0); + tconfig_bind(&tconfig, TCONF_INT, "intkey", &intkey); + tconfig_bind(&tconfig, TCONF_STR, "strkey", &strkey); - int res = tconfig_parse(&tconfig); - MASSERT(res == -1); + ssize_t rsize = tconfig_read(&tconfig, "helmet.conf"); - tconfig_destroy(&tconfig); + printf("%ld\n", rsize); + MASSERT(rsize > 0); - printf("int key = %d\n", intkey); - printf("str key = %s\n", strkey); - return 0; + int res = tconfig_parse(&tconfig); + + MASSERT(res == -1); + + tconfig_destroy(&tconfig); + + printf("int key = %d\n", intkey); + printf("str key = %s\n", strkey); + return 0; } diff --git a/logger.c b/logger.c index 866fb9f..6f7082f 100644 --- a/logger.c +++ b/logger.c @@ -13,29 +13,31 @@ int logger_init(void) { } void logger_dprintf(char* message, ...) { - printf("debug: "); - va_list argptr; - va_start(argptr, message); + printf("debug: "); + va_list argptr; + + va_start(argptr, message); vprintf(message, argptr); - va_end(argptr); - printf("\n"); + va_end(argptr); + printf("\n"); } void logger_iprintf(char* message, ...) { - printf("info: "); - va_list argptr; - va_start(argptr, message); + printf("info: "); + va_list argptr; + + va_start(argptr, message); vprintf(message, argptr); - va_end(argptr); - printf("\n"); + va_end(argptr); + printf("\n"); } void logger_wprintf(char* message, ...) { - printf("warning: "); - va_list argptr; - va_start(argptr, message); - vprintf(message, argptr); - va_end(argptr); - printf("\n"); -} + printf("warning: "); + va_list argptr; + va_start(argptr, message); + vprintf(message, argptr); + va_end(argptr); + printf("\n"); +} diff --git a/server.c b/server.c index 21ac5e2..ca17319 100644 --- a/server.c +++ b/server.c @@ -9,40 +9,42 @@ int server_init(void) { - logger_dprintf("server init"); + logger_dprintf("server init"); return 0; } #define SERVER_CONFIG_ERROR -1 int server_config(void) { - logger_dprintf("server config"); + logger_dprintf("server config"); - tconfig_t tconfig; - tconfig_init(&tconfig); + tconfig_t tconfig; - char* logpath = NULL; - tconfig_bind(&tconfig, TCONF_STR, "logpath", &logpath); + tconfig_init(&tconfig); + + char* logpath = NULL; + + tconfig_bind(&tconfig, TCONF_STR, "logpath", &logpath); ssize_t rsize = tconfig_read(&tconfig, "helmet.conf"); + if (rsize < 0) { return SERVER_CONFIG_ERROR; } - int res = tconfig_parse(&tconfig); + int res = tconfig_parse(&tconfig); + if (res < 0) { return SERVER_CONFIG_ERROR; } - tconfig_destroy(&tconfig); - logger_dprintf("logpath = %s", logpath); + tconfig_destroy(&tconfig); + logger_dprintf("logpath = %s", logpath); return 0; } int server_run(void) { - logger_dprintf("server start"); + logger_dprintf("server start"); return 0; } - - diff --git a/server.h b/server.h index f78d6ad..239d5e0 100644 --- a/server.h +++ b/server.h @@ -7,4 +7,3 @@ int server_config(void); int server_run(void); #endif -