X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.c;h=9ad6bfb8edd7e616e61c16acec38f9a4d5bdb8e3;hp=47c5417df576a56c1d710137c02182a3b7600fa5;hb=c4ecbd8f75be7847f7332dd64f11a0ba54233891;hpb=7598d7747435c4de259df09bdb82911ff893113d diff --git a/string.c b/string.c index 47c5417d..9ad6bfb8 100644 --- a/string.c +++ b/string.c @@ -49,7 +49,8 @@ __must_check __malloc void *para_realloc(void *p, size_t size) * to realloc is equivalent to malloc(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; @@ -85,8 +86,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) */ @@ -103,8 +104,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. @@ -252,8 +253,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()); } @@ -317,13 +321,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) {