Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 41d9a2accd71076daddfe2c101634cc0945b4dfb..dada53e57746f6f77a13eebb9b14ec97f07f7d55 100644 (file)
--- 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 */
@@ -328,8 +316,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 +358,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();