X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.h;h=935c7d456c2c5b6910b356f2ddd52fd62848cf67;hp=d4627f33f0d3ce07885deff483c847e57df5b32a;hb=6bcd10bc4ada11a04bc2b7425afe5a8855592cd2;hpb=3879481ddabc38236b9eee979a090c2a9bfa74d3

diff --git a/string.h b/string.h
index d4627f33..935c7d45 100644
--- a/string.h
+++ b/string.h
@@ -34,6 +34,23 @@ struct para_buffer {
 	void *private_data;
 };
 
+/**
+ * Controls the behavior of for_each_line().
+ *
+ * \sa for_each_line().
+ */
+enum for_each_line_flags {
+	/** Activate read-only mode. */
+	FELF_READ_ONLY = 1 << 0,
+	/** Don't call line handler for the first input line. */
+	FELF_DISCARD_FIRST = 1 << 1,
+};
+
+/** Used for \ref for_each_line(). */
+typedef int line_handler_t(char *, void *);
+int for_each_line(unsigned flags, char *buf, size_t size,
+		line_handler_t *line_handler, void *private_data);
+
 /**
   * Write the contents of a status item to a para_buffer.
   *
@@ -72,12 +89,6 @@ __must_check __malloc char *para_logname(void);
 __must_check __malloc char *para_homedir(void);
 __malloc char *para_hostname(void);
 __printf_2_3 int para_printf(struct para_buffer *b, const char *fmt, ...);
-/** Used for for_each_line() and for_each_line_ro(). */
-typedef int line_handler_t(char *, void *);
-int for_each_line(char *buf, size_t size, line_handler_t *line_handler,
-	void *private_data);
-int for_each_line_ro(char *buf, size_t size, line_handler_t *line_handler,
-	void *private_data);
 int para_atoi64(const char *str, int64_t *result);
 int para_atoi32(const char *str, int32_t *value);
 int get_loglevel_by_name(const char *txt);
@@ -91,3 +102,5 @@ void freep(void *arg);
 int compute_word_num(const char *buf, const char *delim, int offset);
 char *safe_strdup(const char *src, size_t len);
 char *key_value_copy(const char *src, size_t len, const char *key);
+int skip_cells(const char *s, size_t cells_to_skip, size_t *result);
+__must_check int strwidth(const char *s, size_t *result);