X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.h;h=fc55451a32e56b7ff7cde9d402c6ac8b682df9c6;hp=922ba696d18ed4dded4d037bdfba3a96b23aabb3;hb=36f38afb959f19490a38ba50949ba62e7c85c3af;hpb=383d1bfb5084ea5a475e408d3cc9d2e2a3de5b88 diff --git a/string.h b/string.h index 922ba696..fc55451a 100644 --- a/string.h +++ b/string.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 Andre Noll + * Copyright (C) 2006-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -60,6 +60,9 @@ __must_check __malloc void *para_realloc(void *p, size_t size); __must_check __malloc void *para_malloc(size_t size); __must_check __malloc void *para_calloc(size_t size); __must_check __malloc char *para_strdup(const char *s); + +__printf_2_0 unsigned xvasprintf(char **result, const char *fmt, va_list ap); +__printf_2_3 unsigned xasprintf(char **result, const char *fmt, ...); __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); @@ -80,5 +83,13 @@ int para_atoi32(const char *str, int32_t *value); int get_loglevel_by_name(const char *txt); int read_size_header(const char *buf); int create_argv(const char *buf, const char *delim, char ***result); +int create_shifted_argv(const char *buf, const char *delim, char ***result); +int find_arg(const char *arg, char **argv); void free_argv(char **argv); int para_regcomp(regex_t *preg, const char *regex, int cflags); +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);