X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.h;h=5a76c0495ea4b25d949bdd393caf060377622a71;hp=9fb42b263363b6f2584a7807ad4e7bf1b0f0fc64;hb=33713473b1051c2d9f487c66a92a5cbdf1277ce3;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623 diff --git a/string.h b/string.h index 9fb42b26..5a76c049 100644 --- a/string.h +++ b/string.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Andre Noll + * Copyright (C) 2006-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,16 +18,6 @@ /** \file string.h exported sybmols from string.c */ -/** contains name/replacement pairs used by s_a_r_list() - * - * \sa s_a_r() - */ -struct para_macro { - /** the name of the macro */ - char *name; - /** the replacement text */ - char *replacement; -}; __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); @@ -36,14 +26,12 @@ __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 char *para_basename(const char *name); -__must_check __malloc char *s_a_r(const char *src, const char* regex, const char *replacement); -__must_check __malloc char *s_a_r_list(struct para_macro *pm, char *src); void chop(char* buf); __must_check __malloc char *para_tmpname(void); __must_check int para_mkstemp(char *template, mode_t mode); __must_check __malloc char *para_logname(void); __must_check __malloc char *para_homedir(void); -__must_check unsigned split_args(char *args, char ***argv_ptr, int delim); +__must_check unsigned split_args(char *args, char ***argv_ptr, const char *delim); __malloc char *para_hostname(void); void valid_fd_012(void);