cosmetics

2 files changed, 33 insertions, 27 deletions

diff --git a/debug.c b/debug.c
index 9a3512b..736a762 100644
--- a/debug.c
+++ b/debug.c
@@ -68,35 +68,38 @@ uint8_t debug_get_level() {
 }
 
 int debug_set_destination(char *dest, int log_type) {
-    static const char *facstrings[] = { "LOG_DAEMON", "LOG_MAIL", "LOG_USER", "LOG_LOCAL0",
+    static const char *facstrings[] = {
+        "LOG_DAEMON", "LOG_MAIL", "LOG_USER", "LOG_LOCAL0",
 	"LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4",
 	"LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", NULL };
-    static const int facvals[] = { LOG_DAEMON, LOG_MAIL, LOG_USER, LOG_LOCAL0,
+    static const int facvals[] = {
+        LOG_DAEMON, LOG_MAIL, LOG_USER, LOG_LOCAL0,
 	LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4,
 	LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
     extern int errno;
     int i;
 
     if (!strncasecmp(dest, "file:///", 8)) {
-	if (log_type!=FTICKS_LOG) {
+	if (log_type != FTICKS_LOG) {
 	    debug_filepath = stringcopy(dest + 7, 0);
 	    debug_file = fopen(debug_filepath, "a");
 	    if (!debug_file) {
 	        debug_file = stderr;
 	        debugx(1, DBG_ERR, "Failed to open logfile %s\n%s",
-	    	   debug_filepath, strerror(errno));
+                       debug_filepath, strerror(errno));
 	    }
 	    setvbuf(debug_file, NULL, _IONBF, 0);
 	} else {
-	    debug(DBG_WARN, "FTicksSyslogFacility starting with file:/// not permitted, assuming default F-Ticks destination");
+	    debug(DBG_WARN, "FTicksSyslogFacility starting with file:/// not "
+                  "permitted, assuming default F-Ticks destination");
 	}
 	return 1;
     }
-    if (!strncasecmp(dest, "x-syslog://", 11) || (log_type==FTICKS_LOG)) {
+    if (!strncasecmp(dest, "x-syslog://", 11) || log_type == FTICKS_LOG) {
 	if (!strncasecmp(dest, "x-syslog://", 11)) {
-		dest += 11;
-		if (*dest == '/')
-	    	  dest++;
+            dest += 11;
+            if (*dest == '/')
+                dest++;
 	}
 	if (*dest) {
 	    for (i = 0; facstrings[i]; i++)
@@ -104,22 +107,23 @@ int debug_set_destination(char *dest, int log_type) {
 		    break;
 	    if (!facstrings[i])
 		debugx(1, DBG_ERR, "Unknown syslog facility %s", dest);
-	    if (log_type==FTICKS_LOG)
+	    if (log_type == FTICKS_LOG)
 		fticks_syslogfacility = facvals[i];
 	    else
 		debug_syslogfacility = facvals[i];
 	} else {
-		if (log_type==FTICKS_LOG)
-		   fticks_syslogfacility = 0;
-		else
-	    	   debug_syslogfacility = LOG_DAEMON;
+            if (log_type == FTICKS_LOG)
+                fticks_syslogfacility = 0;
+            else
+                debug_syslogfacility = LOG_DAEMON;
     	}
-	if (log_type==FTICKS_LOG) {
-		if (fticks_syslogfacility && !debug_syslogfacility) {
-		    openlog(debug_ident, LOG_PID, fticks_syslogfacility);
-		}
-	} else 
-		openlog(debug_ident, LOG_PID, debug_syslogfacility);
+	if (log_type == FTICKS_LOG) {
+            if (fticks_syslogfacility && !debug_syslogfacility) {
+                openlog(debug_ident, LOG_PID, fticks_syslogfacility);
+            }
+	} else {
+            openlog(debug_ident, LOG_PID, debug_syslogfacility);
+        }
 	return 1;
     }
     debug(DBG_ERR, "Unknown log destination, exiting %s", dest);
@@ -242,7 +246,7 @@ void fticks_debug(const char *format, ...) {
     if (!debug_syslogfacility && !fticks_syslogfacility)
     	debug_logit(0xff, format, ap);
     else {
-    	priority = LOG_DEBUG|fticks_syslogfacility;
+    	priority = LOG_DEBUG | fticks_syslogfacility;
     	vsyslog(priority, format, ap);
     	va_end(ap);
     }
diff --git a/radsecproxy.c b/radsecproxy.c
index 426b65b..e780b96 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1668,7 +1668,7 @@ void replyh(struct server *server, unsigned char *buf) {
     }
 
 #if defined(WANT_FTICKS)
-    if (msg->code == RAD_Access_Accept || msg->code == RAD_Access_Reject) 
+    if (msg->code == RAD_Access_Accept || msg->code == RAD_Access_Reject)
 	if (options.fticks_reporting && from->conf->fticks_viscountry != NULL)
 	    fticks_log(&options, from, msg, rqout);
 #endif
@@ -3082,7 +3082,7 @@ void getmainconfig(const char *configfile) {
 #endif
 	    "Rewrite", CONF_CBK, confrewrite_cb, NULL,
 #if defined(WANT_FTICKS)
-	    "FTicksSyslogFacility", CONF_STR, &options.ftickssyslogfacility, 
+	    "FTicksSyslogFacility", CONF_STR, &options.ftickssyslogfacility,
 	    "FTicksReporting", CONF_STR, &fticks_reporting_str,
 	    "FTicksMAC", CONF_STR, &fticks_mac_str,
 	    "FTicksKey", CONF_STR, &fticks_key_str,
@@ -3241,12 +3241,14 @@ int radsecproxy_main(int argc, char **argv) {
     else if (options.loglevel)
 	debug_set_level(options.loglevel);
     if (!foreground) {
-	debug_set_destination(options.logdestination ? options.logdestination : "x-syslog:///", DEBUG_LOG);
+	debug_set_destination(options.logdestination
+                              ? options.logdestination
+                              : "x-syslog:///", DEBUG_LOG);
 #if defined(WANT_FTICKS)
     	if (options.ftickssyslogfacility) {
-		debug_set_destination(options.ftickssyslogfacility, FTICKS_LOG);
-		free(options.ftickssyslogfacility);
-    	} 
+            debug_set_destination(options.ftickssyslogfacility, FTICKS_LOG);
+            free(options.ftickssyslogfacility);
+    	}
 #endif
     }
     free(options.logdestination);