X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=e881ae09fed1f0d77983cb6eb6081598f3fc3f90;hp=caf432d9748ca3b5e293657359a17ca98f5b8559;hb=34762fdc56d5294c15e03fda433ecfccdc6c5fb2;hpb=f269333700038603703ec79c909d514bee731faf

diff --git a/stat.c b/stat.c
index caf432d9..e881ae09 100644
--- a/stat.c
+++ b/stat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -103,8 +103,14 @@ static void dump_stat_client_list(void)
 /**
  * add a status client to the list
  *
+ * \param fd the file descriptor of the client
+ * \param mask bitfield of status items for this client
+ *
+ * Only those status items having the bit set in \a mask will be
+ * sent to the client.
+ *
  * \return Positive value on success, or -E_TOO_MANY_CLIENTS if
- * the number of connected clients exceeds #MAX_STAT_CLIENTS
+ * the number of connected clients exceeds #MAX_STAT_CLIENTS.
  */
 int stat_client_add(int fd, long unsigned mask)
 {
@@ -137,15 +143,14 @@ int stat_client_add(int fd, long unsigned mask)
  * On write errors, remove the status client from the client list and close its
  * file descriptor.
  */
-void stat_client_write(char *msg, int itemnum)
+void stat_client_write(const char *msg, int itemnum)
 {
 	struct stat_client *sc, *tmp;
-	ssize_t len;
+	size_t len = strlen(msg);
 	struct timeval tv = {0 , 0};
 
-	if (!initialized)
+	if (!initialized || !len)
 		return;
-	len = strlen(msg);
 	list_for_each_entry_safe(sc, tmp, &client_list, node) {
 		int fd = sc->fd, ret;
 		fd_set wfds;
@@ -238,18 +243,18 @@ int stat_line_valid(const char *line)
  * \return If line_handler is not NULL, this function returns the number
  * of bytes not handled to \a line_handler.
  */
-unsigned for_each_line(char *buf, int n, void (*line_handler)(char *))
+size_t for_each_line(char *buf, size_t n, void (*line_handler)(char *))
 {
 	char *start = buf, *end;
-	int i, num_lines = 0;
+	size_t num_lines = 0, bytes_left = n;
 
 //	PARA_INFO_LOG("buf: %s", buf);
-	while (start < buf + n) {
+	while (bytes_left) {
 		char *next_null;
 		char *next_cr;
 
-		next_cr = memchr(start, '\n', buf + n - start);
-		next_null = memchr(start, '\0', buf + n - start);
+		next_cr = memchr(start, '\n', bytes_left);
+		next_null = memchr(start, '\0', bytes_left);
 		if (!next_cr && !next_null)
 			break;
 		if (next_cr && next_null) {
@@ -263,15 +268,14 @@ unsigned for_each_line(char *buf, int n, void (*line_handler)(char *))
 			*end = '\0';
 //			PARA_INFO_LOG("calling line handler: %s\n", start);
 			line_handler(start);
-			start = ++end;
-		} else
-			start = ++end;
+		}
+		start = ++end;
+		bytes_left = buf + n - start;
 	}
 	if (!line_handler)
 		return num_lines;
-	i = buf + n - start;
-	if (i && i != n)
-		memmove(buf, start, i);
-	return i;
+	if (bytes_left && bytes_left != n)
+		memmove(buf, start, bytes_left);
+	return bytes_left;
 }