audiod.c: Add missing space.

[paraslash.git] / client_common.c

diff --git a/client_common.c b/client_common.c
index 58dbdb4bac00f09401172a2d1930021b38aa49e1..9574c36f1f22cabbaa0f090fce9682dbd16ea3f7 100644 (file)
--- a/client_common.c
+++ b/client_common.c
@@ -1,24 +1,16 @@
 /*
  * 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 client_common.c common functions of para_client and para_audiod */
 
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "para.h"
+#include "error.h"
 #include "list.h"
 #include "sched.h"
 #include "client.cmdline.h"
@@ -29,7 +21,6 @@
 #include "string.h"
 #include "client.cmdline.h"
 #include "client.h"
-#include "error.h"
 
 /*
  * rc4 encrypt data before sending
@@ -96,13 +87,13 @@ static int client_connect(struct private_client_data *pcd)
        if (ret < 0)
                return ret;
        /* get new socket */
-       ret = get_socket();
+       ret = get_stream_socket(AF_INET);
        if (ret < 0)
                return ret;
        pcd->fd = ret;
        /* init their_addr */
        init_sockaddr(&their_addr, pcd->conf.server_port_arg, he);
-       ret = para_connect(pcd->fd, &their_addr);
+       ret = PARA_CONNECT(pcd->fd, &their_addr);
        if (ret < 0)
                goto err_out;
        pcd->status = CL_CONNECTED;
@@ -165,9 +156,16 @@ int client_open(int argc, char *argv[], struct private_client_data **pcd_ptr)
                ret = -E_NO_CONFIG;
                goto out;
        }
-       if (!ret)
-               client_cmdline_parser_configfile(pcd->config_file,
-                       &pcd->conf, 0, 0, 0);
+       if (!ret) {
+               struct client_cmdline_parser_params params = {
+                       .override = 0,
+                       .initialize = 0,
+                       .check_required = 0,
+                       .check_ambiguity = 0
+               };
+               client_cmdline_parser_config_file(pcd->config_file,
+                       &pcd->conf, &params);
+       }
        ret = 1;
        PARA_INFO_LOG("loglevel: %d\n", pcd->conf.loglevel_arg);
        PARA_INFO_LOG("config_file: %s\n", pcd->config_file);
@@ -265,8 +263,8 @@ static ssize_t client_recv_buffer(struct private_client_data *pcd)
  * \param t pointer to the task struct for this command
  *
  * Depending on the current state of the connection and the status of the read
- * and write fd sets of \a s, this function performs the neccessary steps to
- * authenticate the connection, to send the commmand given by \a
+ * and write fd sets of \a s, this function performs the necessary steps to
+ * authenticate the connection, to send the command given by \a
  * t->private_data and to receive para_server's output, if any.
  *
  * \sa struct sched, struct task