X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=string.h;h=37c7cd815f0bad1cfa0b376bdbc29fb240b5e2d2;hp=561ff4e8705c4d20baf0b01999503f725cadb820;hb=a398d5009251fa41859006dae5c99afc6824fab2;hpb=a4cf08e8062d1d73c343a628563acf4d9f454742

diff --git a/string.h b/string.h
index 561ff4e..37c7cd8 100644
--- a/string.h
+++ b/string.h
@@ -6,47 +6,13 @@
 
 /** \file string.h exported sybmols from string.c */
 
-/** 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;
-	/** 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);
-__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);
+__must_check __malloc void *adu_realloc(void *p, size_t size);
+__must_check __malloc void *adu_malloc(size_t size);
+__must_check __malloc void *adu_calloc(size_t size);
+__must_check __malloc char *adu_strdup(const char *s);
+__must_check __malloc char *adu_strcat(char *a, const char *b);
 __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 __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 *);
-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,
-	void *private_data);
-int para_atoi64(const char *str, int64_t *result);
-int para_atoi32(const char *str, int32_t *value);
+__must_check int atoi64(const char *str, int64_t *result);
+int parse_uid_arg(const char *orig_arg, struct uid_range **ur);
+int create_argv(const char *line, char ***result);
+void free_argv(char **argv);