X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.h;h=aa8292fdf4ec1f076294842e1b6cb02dbc4f23a6;hp=96595f0ed722fbba317067fed4c6e97ffaef0fe3;hb=698178774b857a8959fe70e360ae6ff755eacf8e;hpb=3a6b996d8b39fdc067df352d1eee757ef2a8f49b;ds=sidebyside

diff --git a/string.h b/string.h
index 96595f0e..aa8292fd 100644
--- a/string.h
+++ b/string.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -62,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; \
 } \
 )
 
@@ -103,3 +101,5 @@ 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);