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

[paraslash.git] / client.c

diff --git a/client.c b/client.c
index be76a491b3e1db0ce15efd194611cde12f719ccf..9565102709f53446e7ebf5e978fd9bae733f4dc0 100644 (file)
--- a/client.c
+++ b/client.c
@@ -63,8 +63,19 @@ static void client_event_handler(struct task *t)
        register_task(&sot.task);
 }
 
        register_task(&sot.task);
 }
 

-/*
- * MAIN
+/**
+ * the client program to connect to para_server
+ *
+ * \param argc usual argument count
+ * \param argv usual argument vector
+ *
+ * It registers two tasks: The client task that communicates with para_server
+ * and the standard out task that writes any output produced by the client task
+ * to standard out.
+ *
+ * \return EXIT_SUCCESS or EXIT_FAILURE
+ *
+ * \sa client_open(), stdout.c, stdout.h, para_client(1), para_server(1)

  */
 int main(int argc, char *argv[])
 {
  */
 int main(int argc, char *argv[])
 {


@@ -74,17 +85,13 @@ int main(int argc, char *argv[])
 
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
 
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;

-       ret = client_parse_config(argc, argv, &pcd);
-       if (ret < 0)
-               goto out;
+       ret = client_open(argc, argv, &pcd);
+       if (ret < 0) /* can not use PARA_LOG here */
+               exit(EXIT_FAILURE);

        pcd->task.event_handler = client_event_handler;
        pcd->task.event_handler = client_event_handler;

-       ret = client_open(pcd);
-       if (ret < 0)
-               goto out;

        ret = sched(&s);
        ret = sched(&s);

-       client_close(pcd);
-out:

        if (ret < 0)
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
        if (ret < 0)
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));

+       client_close(pcd);

        return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }
        return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }