X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.h;h=52f989417d8071a1f2ed33d99ce7fd8ba18d66c1;hp=20cf8defb19b0707f0f1f3e4fdb4f0d6da894c65;hb=b52342d0b5df5446f149f0c1daf26f6e25b2aba7;hpb=bc15c3ff65eb00e04ebc303cfa9ee3d1a4675b35 diff --git a/string.h b/string.h index 20cf8def..52f98941 100644 --- a/string.h +++ b/string.h @@ -1,10 +1,10 @@ /* - * Copyright (C) 2006-2014 Andre Noll + * Copyright (C) 2006 Andre Noll * * 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 { @@ -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, (unsigned)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);