From 5e640884b2e46e19fb1f472145c7ff2c10ad0de8 Mon Sep 17 00:00:00 2001 From: bel Date: Fri, 1 May 2015 21:42:57 +0200 Subject: [PATCH] All global variables in main should start with g_ --- src/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index 73343f97..06ec003c 100644 --- a/src/main.c +++ b/src/main.c @@ -426,7 +426,7 @@ static void process_command_line_arguments(char *argv[], char **options) g_config_file[sizeof(g_config_file)-1] = 0; #ifdef CONFIG_FILE2 - fp = fopen(config_file, "r"); + fp = fopen(g_config_file, "r"); /* try alternate config file */ if (fp == NULL) { @@ -1685,7 +1685,7 @@ int main(int argc, char *argv[]) init_server_name(argc, (const char **)argv); start_civetweb(argc, argv); printf("%s started on port(s) %s with web root [%s]\n", - server_name, mg_get_option(ctx, "listening_ports"), + g_server_name, mg_get_option(ctx, "listening_ports"), mg_get_option(ctx, "document_root")); while (exit_flag == 0) { sleep(1);