From 667f4578a570699b69b16defa6f22e26a315c891 Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Sat, 12 Apr 2008 13:09:43 -0700 Subject: [PATCH] Minor formatting adjustments. --- src/ChangeLog | 7 +++++++ src/utils.c | 26 ++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a2881858..4da5e1d3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2008-04-12 Micah Cowan + + * utils.c (aprintf): Minor formatting changes to Alex's code (80- + column limit, concatenated string literals, avoiding nesting + levels), and removed invocation of free (since we're aborting + anyway). + 2008-04-11 Alexander Dergachev * utils.c (aprintf): Now we are setting limits (1 Mb) for text diff --git a/src/utils.c b/src/utils.c index af621402..f4e56d82 100644 --- a/src/utils.c +++ b/src/utils.c @@ -178,7 +178,8 @@ aprintf (const char *fmt, ...) ret = vasprintf (&str, fmt, args); va_end (args); if (ret < 0 && errno == ENOMEM) - memfatal ("aprintf", UNKNOWN_ATTEMPTED_SIZE); /* for consistency with xmalloc/xrealloc */ + memfatal ("aprintf", UNKNOWN_ATTEMPTED_SIZE); /* for consistency + with xmalloc/xrealloc */ else if (ret < 0) return NULL; return str; @@ -208,19 +209,20 @@ aprintf (const char *fmt, ...) /* Else try again with a larger buffer. */ if (n > -1) /* C99 */ size = n + 1; /* precisely what is needed */ + else if (size >= FMT_MAX_LENGTH) /* We have a huge buffer, */ + { /* maybe we have some wrong + format string? */ + logprintf (LOG_ALWAYS, + _("%s: aprintf: text buffer is too big (%ld bytes), " + "aborting.\n"), + exec_name, size); /* printout a log message */ + abort (); /* and abort... */ + } else { - if (size >= FMT_MAX_LENGTH) /* We have a huge buffer, */ - { /* maybe we have some wrong format string? */ - free (str); /* In this case we must free already allocated memory, */ - logprintf (LOG_ALWAYS, - _("%s: aprintf: text buffer is too big (%ld bytes), \ -free already allocated memory and abort.\n"), - exec_name, size); /* printout a log message */ - abort (); /* and abort... */ - } - /* else, we continue to grow our buffer. */ - size <<= 1; /* twice the old size */ + /* else, we continue to grow our + * buffer: Twice the old size. */ + size <<= 1; } str = xrealloc (str, size); } -- 2.39.2