Changeset 0edc2fb

Timestamp:

2015-10-30T10:31:09Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

129e282

Parents:

884577f

git-author:

dequis <dx@…> (27-10-15 05:36:34)

git-committer:

dequis <dx@…> (30-10-15 10:31:09)

Message:

log: Refactor log_link() to be less redundant.

"I didn't feel like messing with pointer to function pointers",
said the comment. Well, I do, comment. It wasn't a big deal either.

File:

• log.c (modified) (1 diff)

log.c

@@ -51 +51 @@
 void log_link(int level, int output)
 {
-        /* I know it's ugly, but it works and I didn't feel like messing with pointer to function pointers */
+        void (*output_function)(int level, const char *logmessage) = &log_null;
+
+        if (output == LOGOUTPUT_NULL) {
+                output_function = &log_null;
+        } else if (output == LOGOUTPUT_IRC) {
+                output_function = &log_irc;
+        } else if (output == LOGOUTPUT_SYSLOG) {
+                output_function = &log_syslog;
+        } else if (output == LOGOUTPUT_CONSOLE) {
+                output_function = &log_console;
+        }
 
         if (level == LOGLVL_INFO) {
-                if (output == LOGOUTPUT_NULL) {
-                        logoutput.informational = &log_null;
-                } else if (output == LOGOUTPUT_IRC) {
-                        logoutput.informational = &log_irc;
-                } else if (output == LOGOUTPUT_SYSLOG) {
-                        logoutput.informational = &log_syslog;
-                } else if (output == LOGOUTPUT_CONSOLE) {
-                        logoutput.informational = &log_console;
-                }
+                logoutput.informational = output_function;
         } else if (level == LOGLVL_WARNING) {
-                if (output == LOGOUTPUT_NULL) {
-                        logoutput.warning = &log_null;
-                } else if (output == LOGOUTPUT_IRC) {
-                        logoutput.warning = &log_irc;
-                } else if (output == LOGOUTPUT_SYSLOG) {
-                        logoutput.warning = &log_syslog;
-                } else if (output == LOGOUTPUT_CONSOLE) {
-                        logoutput.warning = &log_console;
-                }
+                logoutput.warning = output_function;
         } else if (level == LOGLVL_ERROR) {
-                if (output == LOGOUTPUT_NULL) {
-                        logoutput.error = &log_null;
-                } else if (output == LOGOUTPUT_IRC) {
-                        logoutput.error = &log_irc;
-                } else if (output == LOGOUTPUT_SYSLOG) {
-                        logoutput.error = &log_syslog;
-                } else if (output == LOGOUTPUT_CONSOLE) {
-                        logoutput.error = &log_console;
-                }
+                logoutput.error = output_function;
         }
 #ifdef DEBUG
         else if (level == LOGLVL_DEBUG) {
-                if (output == LOGOUTPUT_NULL) {
-                        logoutput.debug = &log_null;
-                } else if (output == LOGOUTPUT_IRC) {
-                        logoutput.debug = &log_irc;
-                } else if (output == LOGOUTPUT_SYSLOG) {
-                        logoutput.debug = &log_syslog;
-                } else if (output == LOGOUTPUT_CONSOLE) {
-                        logoutput.debug = &log_console;
-                }
+                logoutput.debug = output_function;
         }
 #endif