X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=b4397c8ff192f4dfd0f16e4c7a3bd39254d65b6f;hp=41d9a2accd71076daddfe2c101634cc0945b4dfb;hb=bd38899d7d8cd4043bfee85fcdb55159ca5ba1a2;hpb=1d298ac7426fdc13221f759848dbf766ef606c0b

diff --git a/server.c b/server.c
index 41d9a2ac..b4397c8f 100644
--- a/server.c
+++ b/server.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file server.c Paraslash's main server */
@@ -244,7 +232,13 @@ static void parse_config(int override)
 	}
 	if (!ret) {
 		int tmp = conf.daemon_given;
-		server_cmdline_parser_configfile(cf, &conf, override, 0, 0);
+		struct server_cmdline_parser_params params = {
+			.override = override,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+		};
+		server_cmdline_parser_config_file(cf, &conf, &params);
 		conf.daemon_given = tmp;
 	}
 	/* logfile */
@@ -328,8 +322,9 @@ err:
 
 static void init_random_seed(void)
 {
-	int fd, ret = -1, len = sizeof(unsigned int);
+	int fd, ret = -1;
 	unsigned int seed;
+	size_t len = sizeof(unsigned int);
 
 	fd = open("/dev/urandom", O_RDONLY);
 	if (fd < 0)
@@ -369,6 +364,7 @@ static unsigned do_inits(int argc, char **argv)
 	if (conf.daemon_given)
 		daemon_init();
 	init_selector();
+//	PARA_ERROR_LOG("num: %d\n", mmd->selector_num);
 	PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
 	vss_init();
 	mmd->server_pid = getpid();