Prefix loglevel macros with "LL_".

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 436e72af9c7c5b86eadb217d194fb44cf74db5ed..c9400e9cdcdde5dfa9ec9cdcf0f0b27bbd09a4f8 100644 (file)
--- a/server.c
+++ b/server.c
@@ -153,10 +153,10 @@ __printf_2_3 void para_log(int ll, const char* fmt,...)
        tm = localtime(&t1);
        strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
        fprintf(outfd, "%s ", str);
-       if (conf.loglevel_arg <= INFO)
+       if (conf.loglevel_arg <= LL_INFO)
                fprintf(outfd, "%i: ", ll);
        mypid = getpid();
-       if (conf.loglevel_arg <= INFO)
+       if (conf.loglevel_arg <= LL_INFO)
                fprintf(outfd, "(%d) ", (int)mypid);
        va_start(argp, fmt);
        vfprintf(outfd, fmt, argp);
@@ -198,6 +198,14 @@ err_out:
        exit(EXIT_FAILURE);
 }
 
+/**
+ * (Re-)read the server configuration files.
+ *
+ * \param override Passed to gengetopt to activate the override feature.
+ *
+ * This function also re-opens the logfile and sets the global \a
+ * user_list_file variable.
+ */
 void parse_config_or_die(int override)
 {
        char *home = para_homedir();