Merge branch 'master' of https://github.com/susnux/toxcore into susnux-master

irungentoo · irungentoo · commit c510e2407f8c · 2016-03-01T15:17:00.000-05:00
diff --git a/other/bootstrap_daemon/src/log.c b/other/bootstrap_daemon/src/log.c
@@ -75,6 +75,8 @@ int level_syslog(LOG_LEVEL level)
         case LOG_LEVEL_ERROR:
             return LOG_ERR;
     }
+
+    return LOG_INFO;
 }
 
 void log_syslog(LOG_LEVEL level, const char *format, va_list args)
@@ -92,6 +94,8 @@ FILE *level_stdout(LOG_LEVEL level)
         case LOG_LEVEL_ERROR:
             return stderr;
     }
+
+    return stdout;
 }
 
 void log_stdout(LOG_LEVEL level, const char *format, va_list args)

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,8 @@ int level_syslog(LOG_LEVEL level)`
`75`	`75`	`case LOG_LEVEL_ERROR:`
`76`	`76`	`return LOG_ERR;`
`77`	`77`	`}`
	`78`	`+`
	`79`	`+ return LOG_INFO;`
`78`	`80`	`}`
`79`	`81`
`80`	`82`	`void log_syslog(LOG_LEVEL level, const char *format, va_list args)`
`@@ -92,6 +94,8 @@ FILE *level_stdout(LOG_LEVEL level)`
`92`	`94`	`case LOG_LEVEL_ERROR:`
`93`	`95`	`return stderr;`
`94`	`96`	`}`
	`97`	`+`
	`98`	`+ return stdout;`
`95`	`99`	`}`
`96`	`100`
`97`	`101`	`void log_stdout(LOG_LEVEL level, const char *format, va_list args)`