Merge commit 'fml/master' into next

[paraslash.git] / string.h

diff --git a/string.h b/string.h
index 561ff4e8705c4d20baf0b01999503f725cadb820..922ba696d18ed4dded4d037bdfba3a96b23aabb3 100644 (file)
--- a/string.h
+++ b/string.h
@@ -1,11 +1,17 @@
 /*
 /*

- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file string.h exported sybmols from string.c */
 
  *
  * 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. */
 /** A string buffer used for para_printf(). */
 struct para_buffer {
        /** The buffer. May be \p NULL. */


@@ -14,6 +20,8 @@ struct para_buffer {
        size_t size;
        /** The maximal size this buffer may grow. Zero means unlimited. */
        size_t max_size;
        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;
        /**
        /** The next para_printf() will write at this offset. */
        size_t offset;
        /**


@@ -26,6 +34,28 @@ struct para_buffer {
        void *private_data;
 };
 
        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 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);


@@ -33,14 +63,11 @@ __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 __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);
+__must_check char *para_basename(const char *name);

 void chop(char *buf);
 void chop(char *buf);

-__must_check __malloc char *para_tmpname(void);

 __must_check __malloc char *para_logname(void);
 __must_check __malloc char *para_homedir(void);
 __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);
 __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 *);
 __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 *);


@@ -50,3 +77,8 @@ 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);
        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);