X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.h;h=cdc55d2da64cef1da942543608602b0a6592af2e;hp=febe1a025001c440d02c0de782788bddca1837a5;hb=b55f405f8005821ffa369b929bc0b419da62683d;hpb=db0e72763ac5660b01c8c2db75901f4efa2c44cc

diff --git a/string.h b/string.h
index febe1a02..cdc55d2d 100644
--- a/string.h
+++ b/string.h
@@ -1,37 +1,76 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file string.h exported sybmols from string.c */
 
+/** Flags that change how content is printed into the buffer. */
+enum para_buffer_flags {
+	/** Prefix each buffer with its length. */
+	PBF_SIZE_PREFIX = 1,
+};
+
 /** A string buffer used for para_printf(). */
 struct para_buffer {
 	/** The buffer. May be \p NULL. */
 	char *buf;
 	/** The size of \a buf. */
 	size_t size;
+	/** The maximal size this buffer may grow. Zero means unlimited. */
+	size_t max_size;
+	/** \sa para_buffer_flags. */
+	unsigned flags;
 	/** 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;
 };
 
+/**
+  * Write the contents of a status item to a para_buffer.
+  *
+  * \param b The para_buffer.
+  * \param n The number of the status item.
+  * \param f A format string.
+  *
+  * \return The return value of the underlying call to para_printf().
+  */
+#define WRITE_STATUS_ITEM(b, n, f, ...) (\
+{ \
+	int _ret; \
+	if ((b)->flags & PBF_SIZE_PREFIX) { \
+		_ret = para_printf((b), "%02x:" f, n, ## __VA_ARGS__); \
+	} else { \
+		_ret = para_printf((b), "%s: " f, status_item_list[(n)], \
+			## __VA_ARGS__); \
+	} \
+	_ret; \
+} \
+)
+
 __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);
-__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 char *para_basename(const char *name);
+void chop(char *buf);
 __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);
 __malloc char *para_hostname(void);
-void valid_fd_012(void);
 __printf_2_3 int para_printf(struct para_buffer *b, const char *fmt, ...);
 /** Used for for_each_line() and for_each_line_ro(). */
 typedef int line_handler_t(char *, void *);
@@ -41,3 +80,12 @@ 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);
+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);
+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);