X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=0a14b99a51f0096e979983c9954f9617ea669097;hp=ac6a03fc5de8c0f0290ea0b621a4caa59bcbaf53;hb=4cdf53ccaf94a774be3424763978c56b9bcaf0d1;hpb=d16fe3df649cb48d5ffa26187da3dad4c3066646 diff --git a/para.h b/para.h index ac6a03fc..0a14b99a 100644 --- a/para.h +++ b/para.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2011 Andre Noll + * Copyright (C) 1997-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -71,6 +71,11 @@ extern __printf_2_3 void (*para_log)(int, const char*, ...); vfprintf(stderr, fmt, argp); \ va_end(argp); \ } +/** + * Define the standard log function and activate it. + * + * \param loglevel_barrier See \ref DEFINE_STDERR_LOGGER. + */ #define INIT_STDERR_LOGGING(loglevel_barrier) \ DEFINE_STDERR_LOGGER(stderr_log, loglevel_barrier); \ __printf_2_3 void (*para_log)(int, const char*, ...) = stderr_log; @@ -113,38 +118,9 @@ extern const char *status_item_list[]; int for_each_stat_item(char *item_buf, size_t num_bytes, int (*item_handler)(int, char *)); -/** - * Write a log message to a dynamically allocated string. - * - * \param fmt Usual format string. - * \param p Result pointer. - * - * \sa printf(3). */ -#define PARA_VSPRINTF(fmt, p) \ -{ \ - int n; \ - size_t size = 100; \ - p = para_malloc(size); \ - while (1) { \ - va_list ap; \ - /* Try to print in the allocated space. */ \ - va_start(ap, fmt); \ - n = vsnprintf(p, size, fmt, ap); \ - va_end(ap); \ - /* If that worked, return the string. */ \ - if (n > -1 && n < size) \ - break; \ - /* Else try again with more space. */ \ - if (n > -1) /* glibc 2.1 */ \ - size = n + 1; /* precisely what is needed */ \ - else /* glibc 2.0 */ \ - size *= 2; /* twice the old size */ \ - p = para_realloc(p, size); \ - } \ -} /** - * Return a random non-negative integer in an interval. + * Return a random non-negative integer in an interval. * * \param max Determines maximal possible return value. *