X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.c;h=8b9f1633d95be658c7a6ecc40f291a0e033943bd;hp=52c5183b418e772ee5a603eddb4290755769919e;hb=b42f370628f56fdf0d7b9261567eb2033c9ae18a;hpb=45f29beab3d711b91e4d3551958173f53f1c5436 diff --git a/string.c b/string.c index 52c5183b..8b9f1633 100644 --- a/string.c +++ b/string.c @@ -1,19 +1,7 @@ /* * Copyright (C) 2004-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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file string.c memory allocation and string handling functions */ @@ -22,7 +10,6 @@ #include "string.h" #include /* gettimeofday */ -#include #include #include /* uname() */ #include @@ -49,8 +36,10 @@ __must_check __malloc void *para_realloc(void *p, size_t size) * No need to check for NULL pointers: If p is NULL, the call * to realloc is equivalent to malloc(size) */ + assert(size); if (!(p = realloc(p, size))) { - PARA_EMERG_LOG("%s", "realloc failed, aborting\n"); + PARA_EMERG_LOG("realloc failed (size = %zu), aborting\n", + size); exit(EXIT_FAILURE); } return p; @@ -70,6 +59,7 @@ __must_check __malloc void *para_realloc(void *p, size_t size) */ __must_check __malloc void *para_malloc(size_t size) { + assert(size); void *p = malloc(size); if (!p) { @@ -86,8 +76,8 @@ __must_check __malloc void *para_malloc(size_t size) * * A wrapper for calloc(3) which exits on errors. * - * A pointer to the allocated and zeroed-out memory, which is suitably aligned - * for any kind of variable. + * \return A pointer to the allocated and zeroed-out memory, which is suitably + * aligned for any kind of variable. * * \sa calloc(3) */ @@ -104,8 +94,8 @@ __must_check __malloc void *para_calloc(size_t size) * * \param s string to be duplicated * - * A wrapper for strdup(3). It calls exit(EXIT_FAILURE) on errors, i.e. there - * is no need to check the return value in the caller. + * A wrapper for strdup(3). It calls \p exit(EXIT_FAILURE) on errors, i.e. + * there is no need to check the return value in the caller. * * \return A pointer to the duplicated string. If \p s was the NULL pointer, * an pointer to an empty string is returned. @@ -223,93 +213,6 @@ __must_check __malloc char *para_basename(const char *name) return para_strdup(p); } -/** - * simple search and replace routine - * - * \param src source string - * \param macro_name the name of the macro - * \param replacement the replacement format string - * - * In \p src, replace each occurence of \p macro_name(arg) by the string - * determined by the \p replacement format string. \p replacement may (but - * needs not) contain a single string conversion specifier (%s) which gets - * replaced by \p arg. - * - * \return A string in which all matches in \p src are replaced, or \p NULL if - * an syntax error was encountered. Caller must free the result. - * - * \sa regcomp(3) - */ -__must_check __malloc char *s_a_r(const char *src, const char* macro_name, - const char *replacement) -{ - regex_t preg; - size_t nmatch = 1; - regmatch_t pmatch[1]; - int eflags = 0; - char *dest = NULL; - const char *bufptr = src; - - if (!macro_name || !replacement || !src) - return para_strdup(src); - regcomp(&preg, macro_name, 0); - while (regexec(&preg, bufptr, nmatch, pmatch, eflags) - != REG_NOMATCH) { - char *tmp, *arg, *o_bracket, *c_bracket; - - o_bracket = strchr(bufptr + pmatch[0].rm_so, '('); - c_bracket = o_bracket? strchr(o_bracket, ')') : NULL; - if (!c_bracket) - goto out; - tmp = para_strdup(bufptr); - tmp[pmatch[0].rm_so] = '\0'; - dest = para_strcat(dest, tmp); - free(tmp); - - arg = para_strdup(o_bracket + 1); - arg[c_bracket - o_bracket - 1] = '\0'; - tmp = make_message(replacement, arg); - free(arg); - dest = para_strcat(dest, tmp); - free(tmp); - bufptr = c_bracket; - bufptr++; - } - dest = para_strcat(dest, bufptr); -// PARA_DEBUG_LOG("%s: returning %s\n", __func__, dest); -out: - regfree(&preg); - return dest; -} - -/** - * replace a string according to a list of macros - * - * \param macro_list the array containing a macro/replacement pairs. - * \param src the source string - * - * This function just calls s_a_r() for each element of \p macro_list. - * - * \return \p NULL if one of the underlying calls to \p s_a_r returned \p NULL. - * Otherwise the completely expanded version of \p src is returned. - */ -__must_check __malloc char *s_a_r_list(struct para_macro *macro_list, char *src) -{ - struct para_macro *mp = macro_list; - char *ret = NULL, *tmp = para_strdup(src); - - while (mp->name) { - ret = s_a_r(tmp, mp->name, mp->replacement); - free(tmp); - if (!ret) /* syntax error */ - return NULL; - tmp = ret; - mp++; - } - //PARA_DEBUG_LOG("%s: returning %s\n", __func__, dest); - return ret; -} - /** * cut trailing newline * @@ -340,8 +243,11 @@ void chop(char *buf) __must_check __malloc char *para_tmpname(void) { struct timeval now; + unsigned int seed; + gettimeofday(&now, NULL); - srand(now.tv_usec); + seed = now.tv_usec; + srand(seed); return make_message("%08i", rand()); } @@ -405,13 +311,13 @@ __must_check __malloc char *para_homedir(void) * \param argv_ptr pointer to the list of substrings * \param delim delimiter * - * This function modifies \p args by replacing each occurance of \p delim by - * zero. A NULL-terminated array of pointers to char* is allocated dynamically + * This function modifies \a args by replacing each occurance of \a delim by + * zero. A \p NULL-terminated array of pointers to char* is allocated dynamically * and these pointers are initialized to point to the broken-up substrings - * within \p args. A pointer to this array is returned via \p argv_ptr. It's OK - * to call this function with \p args \p == \p NULL. + * within \a args. A pointer to this array is returned via \a argv_ptr. It's OK + * to call this function with \a args \a == \p NULL. * - * \return The number of substrings found in \p args. + * \return The number of substrings found in \a args. */ __must_check unsigned split_args(char *args, char ***argv_ptr, const char *delim) {