X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.h;h=aa8292fdf4ec1f076294842e1b6cb02dbc4f23a6;hp=6d0990749529489ec03d7e517891f4dc3b93322c;hb=698178774b857a8959fe70e360ae6ff755eacf8e;hpb=23b121a85984baa9252f4b4c0b8c4f186e394bb7

diff --git a/string.h b/string.h
index 6d099074..aa8292fd 100644
--- a/string.h
+++ b/string.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file string.h exported sybmols from string.c */
+/** \file string.h exported symbols from string.c */
 
 /** Flags that change how content is printed into the buffer. */
 enum para_buffer_flags {
@@ -42,6 +42,8 @@ struct para_buffer {
 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(). */
@@ -60,14 +62,12 @@ int for_each_line(unsigned flags, char *buf, size_t size,
   */
 #define WRITE_STATUS_ITEM(b, n, f, ...) (\
 { \
-	int _ret; \
 	if ((b)->flags & PBF_SIZE_PREFIX) { \
-		_ret = para_printf((b), "%02x:" f, n, ## __VA_ARGS__); \
+		para_printf((b), "%02x:" f, n, ## __VA_ARGS__); \
 	} else { \
-		_ret = para_printf((b), "%s: " f, status_item_list[(n)], \
+		para_printf((b), "%s: " f, status_item_list[(n)], \
 			## __VA_ARGS__); \
 	} \
-	_ret; \
 } \
 )
 
@@ -82,7 +82,6 @@ __must_check __malloc __printf_1_2 char *make_message(const char *fmt, ...);
 __must_check __malloc char *para_strcat(char *a, const char *b);
 __must_check __malloc char *para_dirname(const char *name);
 __must_check char *para_basename(const char *name);
-void chop(char *buf);
 __must_check __malloc char *para_logname(void);
 __must_check __malloc char *para_homedir(void);
 __malloc char *para_hostname(void);
@@ -100,3 +99,7 @@ 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);
+__must_check int sanitize_str(const char *src, size_t max_width,
+		char **result, size_t *width);