X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=string.c;h=c22dc7cfce51954c65ecd407857e0352b09a53f3;hb=d1f0f00fdedf1254b7e4119d8148a0da37b12a23;hp=283c46e23442f41dbfc4ad0721fe60cd3f16e397;hpb=bd533f99665cab3c9d64c14c242a8f80bdce71c5;p=paraslash.git

diff --git a/string.c b/string.c
index 283c46e2..c22dc7cf 100644
--- a/string.c
+++ b/string.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -350,19 +350,35 @@ __malloc char *para_hostname(void)
 }
 
 /**
- * Used to distinguish between read-only and read-write mode.
+ * Call a custom function for each complete line.
+ *
+ * \param flags Any combination of flags defined in \ref for_each_line_flags.
+ * \param buf The buffer containing data separated by newlines.
+ * \param size The number of bytes in \a buf.
+ * \param line_handler The custom function.
+ * \param private_data Pointer passed to \a line_handler.
+ *
+ * For each complete line in \p buf, \p line_handler is called. The first
+ * argument to \p line_handler is (a copy of) the current line, and \p
+ * private_data is passed as the second argument.  If the \p FELF_READ_ONLY
+ * flag is unset, a pointer into \a buf is passed to the line handler,
+ * otherwise a pointer to a copy of the current line is passed instead. This
+ * copy is freed immediately after the line handler returns.
+ *
+ * The function returns if \p line_handler returns a negative value or no more
+ * lines are in the buffer.  The rest of the buffer (last chunk containing an
+ * incomplete line) is moved to the beginning of the buffer if FELF_READ_ONLY is
+ * unset.
+ *
+ * \return If \p FELF_READ_ONLY is not set in \a flags, this function returns
+ * the number of bytes not handled to \p line_handler, otherwise the number of
+ * complete lines. On errors the negative error code of the \p line_handler is
+ * returned.
  *
- * \sa for_each_line(), for_each_line_ro().
+ * \sa \ref for_each_line_flags.
  */
-enum for_each_line_modes{
-	/** Activate read-only mode. */
-	LINE_MODE_RO,
-	/** Activate read-write mode. */
-	LINE_MODE_RW
-};
-
-static int for_each_complete_line(enum for_each_line_modes mode, char *buf,
-		size_t size, line_handler_t *line_handler, void *private_data)
+int for_each_line(unsigned flags, char *buf, size_t size,
+		line_handler_t *line_handler, void *private_data)
 {
 	char *start = buf, *end;
 	int ret, i, num_lines = 0;
@@ -383,11 +399,7 @@ static int for_each_complete_line(enum for_each_line_modes mode, char *buf,
 		} else
 			end = next_cr;
 		num_lines++;
-		if (!line_handler) {
-			start = ++end;
-			continue;
-		}
-		if (mode == LINE_MODE_RO) {
+		if (flags & FELF_READ_ONLY) {
 			size_t s = end - start;
 			char *b = para_malloc(s + 1);
 			memcpy(b, start, s);
@@ -403,7 +415,7 @@ static int for_each_complete_line(enum for_each_line_modes mode, char *buf,
 			return ret;
 		start = ++end;
 	}
-	if (!line_handler || mode == LINE_MODE_RO)
+	if (flags & FELF_READ_ONLY)
 		return num_lines;
 	i = buf + size - start;
 	if (i && i != size)
@@ -411,57 +423,6 @@ static int for_each_complete_line(enum for_each_line_modes mode, char *buf,
 	return i;
 }
 
-/**
- * Call a custom function for each complete line.
- *
- * \param buf The buffer containing data separated by newlines.
- * \param size The number of bytes in \a buf.
- * \param line_handler The custom function.
- * \param private_data Pointer passed to \a line_handler.
- *
- * If \p line_handler is \p NULL, the function returns the number of complete
- * lines in \p buf.  Otherwise, \p line_handler is called for each complete
- * line in \p buf.  The first argument to \p line_handler is the current line,
- * and \p private_data is passed as the second argument.  The function returns
- * if \p line_handler returns a negative value or no more lines are in the
- * buffer.  The rest of the buffer (last chunk containing an incomplete line)
- * is moved to the beginning of the buffer.
- *
- * \return If \p line_handler is not \p NULL, this function returns the number
- * of bytes not handled to \p line_handler on success, or the negative return
- * value of the \p line_handler on errors.
- *
- * \sa for_each_line_ro().
- */
-int for_each_line(char *buf, size_t size, line_handler_t *line_handler,
-		void *private_data)
-{
-	return for_each_complete_line(LINE_MODE_RW, buf, size, line_handler,
-		private_data);
-}
-
-/**
- * Call a custom function for each complete line.
- *
- * \param buf Same meaning as in \p for_each_line().
- * \param size Same meaning as in \p for_each_line().
- * \param line_handler Same meaning as in \p for_each_line().
- * \param private_data Same meaning as in \p for_each_line().
- *
- * This function behaves like \p for_each_line(), but \a buf is left unchanged.
- *
- * \return On success, the function returns the number of complete lines in \p
- * buf, otherwise the (negative) return value of \p line_handler is returned.
- *
- * \sa for_each_line().
- */
-int for_each_line_ro(char *buf, size_t size, line_handler_t *line_handler,
-		void *private_data)
-{
-	return for_each_complete_line(LINE_MODE_RO, buf, size, line_handler,
-		private_data);
-}
-
 /** Return the hex characters of the lower 4 bits. */
 #define hex(a) (hexchar[(a) & 15])