X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.h;h=561ff4e8705c4d20baf0b01999503f725cadb820;hp=6759c261318232f1cf3b61aedc15911412422982;hb=7b3c325a51b3b5cc2782dfc2e24613d8ecdc5618;hpb=ea689d919fd6fdbfaba2de9d1cd207e033c319fd diff --git a/string.h b/string.h index 6759c261..561ff4e8 100644 --- a/string.h +++ b/string.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andre Noll + * Copyright (C) 2006-2008 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -12,8 +12,18 @@ struct para_buffer { char *buf; /** The size of \a buf. */ size_t size; + /** The maximal size this buffer may grow. Zero means unlimited. */ + size_t max_size; /** The next para_printf() will write at this offset. */ size_t offset; + /** + * If an attempt to print into this buffer is made that would need to + * grow \a buf to a size larger than \a max_size, then this function is + * called. + */ + int (*max_size_handler)(char *buf, size_t size, void *private_data); + /** Passed to max_size_handler(). */ + void *private_data; }; __must_check __malloc void *para_realloc(void *p, size_t size); @@ -23,10 +33,9 @@ __must_check __malloc char *para_strdup(const char *s); __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 __malloc char *para_basename(const char *name); -void chop(char* buf); +__must_check const char *para_basename(const char *name); +void chop(char *buf); __must_check __malloc char *para_tmpname(void); -__must_check int para_mkstemp(char *template, mode_t mode); __must_check __malloc char *para_logname(void); __must_check __malloc char *para_homedir(void); __must_check unsigned split_args(char *args, char *** const argv_ptr, const char *delim); @@ -37,7 +46,7 @@ __printf_2_3 int para_printf(struct para_buffer *b, const char *fmt, ...); typedef int line_handler_t(char *, void *); int for_each_line(char *buf, size_t size, line_handler_t *line_handler, void *private_data); -int for_each_line_ro(char *buf, size_t size, line_handler_t line_handler, +int for_each_line_ro(char *buf, size_t size, line_handler_t *line_handler, void *private_data); int para_atoi64(const char *str, int64_t *result); int para_atoi32(const char *str, int32_t *value);