X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=202dff8fc22970961ea1f2594e6c7db2f85c1965;hp=dc51119267c0d18c870240898588a9fdcf0f1637;hb=d330cf697501c14bb696256cb27c9e69b9edf3f4;hpb=505cfe0c6c8f9ef79d259ee64404ab40f2057081 diff --git a/stat.c b/stat.c index dc511192..202dff8f 100644 --- a/stat.c +++ b/stat.c @@ -1,19 +1,7 @@ /* * Copyright (C) 2005-2007 Andre Noll * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** @@ -143,15 +131,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; @@ -229,55 +216,3 @@ int stat_line_valid(const char *line) return -E_UNKNOWN_STAT_ITEM; } -/** - * call a custom function for each complete line - * - * \param buf the buffer containing data seperated by newlines - * \param n the number of bytes in \a buf - * \param line_handler the custom function - * - * If \a line_handler is \p NULL, return number of complete lines in buf. - * Otherwise, call \a line_handler for each complete line. The rest of the - * buffer (last chunk containing incomplete line is moved to the beginning of - * the buffer. - * - * \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 *)) -{ - char *start = buf, *end; - int i, num_lines = 0; - -// PARA_INFO_LOG("buf: %s", buf); - while (start < buf + n) { - char *next_null; - char *next_cr; - - next_cr = memchr(start, '\n', buf + n - start); - next_null = memchr(start, '\0', buf + n - start); - if (!next_cr && !next_null) - break; - if (next_cr && next_null) { - end = next_cr < next_null? next_cr : next_null; - } else if (next_null) { - end = next_null; - } else - end = next_cr; - num_lines++; - if (line_handler) { - *end = '\0'; -// PARA_INFO_LOG("calling line handler: %s\n", start); - line_handler(start); - start = ++end; - } else - start = ++end; - } - if (!line_handler) - return num_lines; - i = buf + n - start; - if (i && i != n) - memmove(buf, start, i); - return i; -} -