command.c: cast members of struct timeval to long unsigned

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index abd0419f6f99bb2529982beeecf0d813061b5fd6..95711f1fce1c4ea56f8bbe00ff829d5a8bbc401c 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -19,13 +19,14 @@
 
 #include "recv.h"
 #include "recv.cmdline.h"
 
 #include "recv.h"
 #include "recv.cmdline.h"

+#include "fd.h"

 #include "error.h"
 
 struct gengetopt_args_info conf;
 
 INIT_RECV_ERRLISTS;
 
 #include "error.h"
 
 struct gengetopt_args_info conf;
 
 INIT_RECV_ERRLISTS;
 

-__printf_2_3 void para_log(int ll, char* fmt,...)
+__printf_2_3 void para_log(int ll, const char* fmt,...)

 {
        va_list argp;
 
 {
        va_list argp;
 


@@ -47,7 +48,8 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
                printf("available receivers: ");
                for (i = 0; receivers[i].name; i++)
                        printf("%s%s", i? " " : "", receivers[i].name);
                printf("available receivers: ");
                for (i = 0; receivers[i].name; i++)
                        printf("%s%s", i? " " : "", receivers[i].name);

-               printf("\nTry para_recv -r<receivername>:-h for help on <receivername>\n");
+               printf("\nTry\n\tpara_recv -r '<receivername> -h'\n"
+                       "for help on <receivername>.\n");

                exit(EXIT_SUCCESS);
        }
        return check_receiver_arg(conf.receiver_arg, receiver_num);
                exit(EXIT_SUCCESS);
        }
        return check_receiver_arg(conf.receiver_arg, receiver_num);


@@ -83,13 +85,11 @@ recv:
        timeout.tv_usec = 1000 * 1000;
        max = -1;
        ret = r->pre_select(&rn, &rfds, &wfds, &timeout);
        timeout.tv_usec = 1000 * 1000;
        max = -1;
        ret = r->pre_select(&rn, &rfds, &wfds, &timeout);

-       max = MAX(max, ret);
+       max = PARA_MAX(max, ret);

 
        PARA_DEBUG_LOG("timeout: %lums\n", tv2ms(&timeout));
 
        PARA_DEBUG_LOG("timeout: %lums\n", tv2ms(&timeout));

-       ret = select(max + 1, &rfds, &wfds, NULL, &timeout);
+       ret = para_select(max + 1, &rfds, &wfds, &timeout);

        if (ret < 0) {
        if (ret < 0) {

-               if (errno == EINTR || errno == EAGAIN)
-                       goto recv;

                ret = -E_RECV_SELECT;
                goto out;
        }
                ret = -E_RECV_SELECT;
                goto out;
        }


@@ -104,13 +104,13 @@ recv:
                goto recv;
        }
        ret = write(STDOUT_FILENO, rn.buf, rn.loaded);
                goto recv;
        }
        ret = write(STDOUT_FILENO, rn.buf, rn.loaded);

-       PARA_DEBUG_LOG("wrote %d/%d\n", ret, rn.loaded);
+       PARA_DEBUG_LOG("wrote %d/%zd\n", ret, rn.loaded);

        if (ret < 0) {
                ret = -E_WRITE_STDOUT;
                goto out;
        }
        if (ret != rn.loaded) {
        if (ret < 0) {
                ret = -E_WRITE_STDOUT;
                goto out;
        }
        if (ret != rn.loaded) {

-               PARA_INFO_LOG("short write %d/%d\n", ret, rn.loaded);
+               PARA_INFO_LOG("short write %d/%zd\n", ret, rn.loaded);

                memmove(rn.buf, rn.buf + ret, rn.loaded - ret);
        }
        rn.loaded -= ret;
                memmove(rn.buf, rn.buf + ret, rn.loaded - ret);
        }
        rn.loaded -= ret;


@@ -122,6 +122,6 @@ out:
        if (r)
                r->shutdown();
        if (ret < 0)
        if (r)
                r->shutdown();
        if (ret < 0)

-               PARA_NOTICE_LOG("%d: (%s)\n", ret, PARA_STRERROR(-ret));
+               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));

        return ret;
 }
        return ret;
 }