Merge branch 'master' into next

[paraslash.git] / string.h

diff --git a/string.h b/string.h
index 38e5edc..922ba69 100644 (file)
--- a/string.h
+++ b/string.h
@@ -65,10 +65,8 @@ __must_check __malloc char *para_strcat(char *a, const char *b);
 __must_check __malloc char *para_dirname(const char *name);
 __must_check char *para_basename(const char *name);
 void chop(char *buf);
 __must_check __malloc char *para_dirname(const char *name);
 __must_check 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 __malloc char *para_logname(void);
 __must_check __malloc char *para_homedir(void);

-unsigned split_args(char *args, char *** const argv_ptr, const char *delim);

 __malloc char *para_hostname(void);
 __printf_2_3 int para_printf(struct para_buffer *b, const char *fmt, ...);
 /** Used for for_each_line() and for_each_line_ro(). */
 __malloc char *para_hostname(void);
 __printf_2_3 int para_printf(struct para_buffer *b, const char *fmt, ...);
 /** Used for for_each_line() and for_each_line_ro(). */


@@ -81,3 +79,6 @@ 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 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);