First draft of the dccp sender/receiver pair.

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index aaccb06ac77fcd7bded8ffc46c300039227eabe1..c7bca83a9ada429c8f498ba63735d1b1ff0f3581 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -15,7 +15,6 @@
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */

-#include "gcc-compat.h"

 #include "para.h"
 
 #include "recv.h"
 #include "para.h"
 
 #include "recv.h"


@@ -105,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;


@@ -123,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;
 }