From: Andre Noll <maan@systemlinux.org>
Date: Thu, 12 Nov 2009 23:48:19 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.1~115^2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=5c07b5c17b25240495a0acee24ca6b03c8d81e72;hp=-c

Merge branch 'maint'
---

5c07b5c17b25240495a0acee24ca6b03c8d81e72
diff --combined send_common.c
index 388fde03,8653c330..2af6a8da
--- a/send_common.c
+++ b/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;