Merge pull request #1 from gfto/master

merge from gfto/mptsd

Makefile

 RM = /bin/rm -f
 Q = @
 
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+ifeq ($(uname_S),Darwin)
+LIBS = -lpthread -lm
+else
 LIBS = -lpthread -lm -lrt
+endif
 
 FUNCS_DIR = libfuncs
 FUNCS_LIB = $(FUNCS_DIR)/libfuncs.a

config.c

 
 extern char *program_id;
 
-static void show_usage() {
+static void show_usage(void) {
 	printf("%s\n", program_id);
 	puts(copyright);
 	puts("");
 				break;
 			case 'H':
 			case 'h':
-				show_usage(0);
+				show_usage();
 				exit(0);
 				break;
 		}

mptsd.c

 	keep_going = 0;
 }
 
-void init_signals() {
+void init_signals(void) {
 	signal(SIGCHLD, SIG_IGN);
 	signal(SIGPIPE, SIG_IGN);
 
 	daemonize(config->pidfile);
 	web_server_start(config);
 	log_init(config->logident, config->syslog_active, config->pidfile == NULL, config->loghost, config->logport);
-	init_signals(config);
+	init_signals();
 
 	LOGf("INIT  : %s %s (%s)\n" , server_sig, server_ver, config->ident);
 

network.c

 				regcomp(&http_response, "^HTTP/1.[0-1] (([0-9]{3}) .*)", REG_EXTENDED);
 				if (regexec(&http_response,buf,3,res,0) != REG_NOMATCH) {
 					char codestr[4];
-					if ((unsigned int)res[1].rm_eo-res[1].rm_so < sizeof(xresponse)) {
+					if ((unsigned int)res[1].rm_eo-res[1].rm_so < (unsigned int)sizeof(xresponse)) {
 						strncpy(xresponse, &buf[res[1].rm_so], res[1].rm_eo-res[1].rm_so);
 						xresponse[res[1].rm_eo-res[1].rm_so] = '\0';
 						chomp(xresponse);

output_psi.c

 }
 
 static void output_psi_init_tdt_tot(CONFIG *conf, OUTPUT *o) {
-	conf = conf; // Silence warning
+	(void)conf; // Silence warning
 	o->pid_tdt_cont = 15;
 	o->tdt = ts_tdt_alloc_init(time(NULL));
 	o->tot = ts_tot_alloc_init(time(NULL));