Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Thu, 12 Nov 2009 23:48:19 +0000 (00:48 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 12 Nov 2009 23:48:19 +0000 (00:48 +0100)
1  2 
send_common.c

diff --combined send_common.c
@@@ -6,10 -6,7 +6,10 @@@
  
  /** \file send_common.c Functions used by more than one paraslash sender. */
  
 +#include <regex.h>
  #include <dirent.h>
 +#include <osl.h>
 +
  #include "para.h"
  #include "error.h"
  #include "string.h"
@@@ -162,8 -159,8 +162,8 @@@ void send_chunk(struct sender_client *s
                        if (ret < 0)
                                goto out;
                }
-               sc->header_sent = 1;
        }
+       sc->header_sent = 1;
        ret = send_queued_chunks(sc->fd, sc->cq, max_bytes_per_write);
        if (ret < 0) {
                shutdown_client(sc, ss);
@@@ -217,7 -214,7 +217,7 @@@ void init_sender_status(struct sender_s
   *
   * \return The string printed in the "si" command.
   */
 -char *get_sender_info(struct sender_status *ss, char *name)
 +char *get_sender_info(struct sender_status *ss, const char *name)
  {
        char *clnts = NULL, *ret;
        struct sender_client *sc, *tmp_sc;