X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.h;h=aa8292fdf4ec1f076294842e1b6cb02dbc4f23a6;hp=f3e935e3496de052e0afdce77f865eea1f0639b1;hb=1ada5f286b031bde90d5cdaf8f85311cbfa7db6b;hpb=9b406cbe5d20ba969713ca3d7a8033e697476d75 diff --git a/string.h b/string.h index f3e935e3..aa8292fd 100644 --- a/string.h +++ b/string.h @@ -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);