Merge branch 'crypt' into next

[paraslash.git] / string.h

diff --git a/string.h b/string.h
index 77e62e907263b6c15e4d470f2dc86951d9581269..a9dfae90019ed9cd37490c9d4555bc06f53219be 100644 (file)
--- a/string.h
+++ b/string.h
@@ -35,10 +35,9 @@ __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);
+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(). */