diff options
author | Johann Latocha | 2012-01-30 22:15:44 +0100 |
---|---|---|
committer | Johann Latocha | 2012-01-30 22:15:44 +0100 |
commit | 1dc88febdcb2a1d09dfca592bb47106512526b29 (patch) | |
tree | 8fc188c761ec13d6fa96f206ee3c00117a8204d2 /src/server/utils.c | |
parent | [SERVER] Timeout for client sockets (diff) | |
download | dnbd3-1dc88febdcb2a1d09dfca592bb47106512526b29.tar.gz dnbd3-1dc88febdcb2a1d09dfca592bb47106512526b29.tar.xz dnbd3-1dc88febdcb2a1d09dfca592bb47106512526b29.zip |
[ALL] Reformat (line wrapping, indent)
Diffstat (limited to 'src/server/utils.c')
-rw-r--r-- | src/server/utils.c | 123 |
1 files changed, 61 insertions, 62 deletions
diff --git a/src/server/utils.c b/src/server/utils.c index ab0d29d..3a42849 100644 --- a/src/server/utils.c +++ b/src/server/utils.c @@ -27,91 +27,90 @@ void dnbd3_write_pid_file(pid_t pid) { - FILE *f = fopen(SERVER_PID_FILE, "w"); - if(f != NULL) - { - fprintf(f, "%i", pid); - fclose(f); - } - else - { - printf("ERROR: Couldn't write pid file (%s).\n", SERVER_PID_FILE); - } + FILE *f = fopen(SERVER_PID_FILE, "w"); + if (f != NULL) + { + fprintf(f, "%i", pid); + fclose(f); + } + else + { + printf("ERROR: Couldn't write pid file (%s).\n", SERVER_PID_FILE); + } } pid_t dnbd3_read_pid_file() { - pid_t pid = 0; + pid_t pid = 0; - FILE *f = fopen(SERVER_PID_FILE, "r"); - if(f != NULL) - { - fscanf(f, "%i", &pid); - fclose(f); - } - else - { - printf("ERROR: Couldn't read pid file (%s).\n", SERVER_PID_FILE); - } + FILE *f = fopen(SERVER_PID_FILE, "r"); + if (f != NULL) + { + fscanf(f, "%i", &pid); + fclose(f); + } + else + { + printf("ERROR: Couldn't read pid file (%s).\n", SERVER_PID_FILE); + } - return pid; + return pid; } void dnbd3_delete_pid_file() { - if (unlink(SERVER_PID_FILE) != 0) - { - printf("ERROR: Couldn't delete pid file (%s).\n", SERVER_PID_FILE); - } + if (unlink(SERVER_PID_FILE) != 0) + { + printf("ERROR: Couldn't delete pid file (%s).\n", SERVER_PID_FILE); + } } - void dnbd3_load_config(char* config_file_name) { - dnbd3_ht_create(); - FILE *config_file = fopen(config_file_name, "r"); + dnbd3_ht_create(); + FILE *config_file = fopen(config_file_name, "r"); - if (config_file == NULL) - { - printf("ERROR: Config file not found: %s\n", config_file_name); - exit(EXIT_FAILURE); - } + if (config_file == NULL) + { + printf("ERROR: Config file not found: %s\n", config_file_name); + exit(EXIT_FAILURE); + } - char line[MAX_FILE_NAME + 1 + MAX_FILE_ID]; - char* image_name = NULL; - char* image_id = NULL; + char line[MAX_FILE_NAME + 1 + MAX_FILE_ID]; + char* image_name = NULL; + char* image_id = NULL; - while (fgets(line, sizeof(line), config_file) != NULL) - { - sscanf(line, "%as %as", &image_name, &image_id); - if (dnbd3_ht_insert(image_id, image_name) < 0) - { - printf("ERROR: Image name or ID is too big\n"); - exit(EXIT_FAILURE); - } - } - fclose(config_file); + while (fgets(line, sizeof(line), config_file) != NULL) + { + sscanf(line, "%as %as", &image_name, &image_id); + if (dnbd3_ht_insert(image_id, image_name) < 0) + { + printf("ERROR: Image name or ID is too big\n"); + exit(EXIT_FAILURE); + } + } + fclose(config_file); } void dnbd3_reload_config(char* config_file_name) { - dnbd3_ht_destroy(); - dnbd3_load_config(config_file_name); + dnbd3_ht_destroy(); + dnbd3_load_config(config_file_name); } void dnbd3_send_signal(int signum) { - pid_t pid = dnbd3_read_pid_file(); - if (pid != 0) - { - if (kill(pid, signum) != 0) - { - printf("ERROR: dnbd3-server is not running\n"); - dnbd3_delete_pid_file(); - } - } - else - { - printf("ERROR: dnbd3-server is not running\n"); - } + pid_t pid = dnbd3_read_pid_file(); + if (pid != 0) + { + if (kill(pid, signum) != 0) + { + printf("ERROR: dnbd3-server is not running\n"); + dnbd3_delete_pid_file(); + } + } + else + { + printf("ERROR: dnbd3-server is not running\n"); + } } |