On 04.06.2012 16:51, Ville Skyttä wrote:
On 2012-06-03 13:44, Klaus Schmidinger wrote:
- Renamed the function cString::sprintf(const char *fmt, va_list&ap) to vsprintf(),
Hm, I don't see this change actually implemented in the source...?
Are you sure you're looking at the right files?
Here's an excerpt from the diff:
--- vdr-1.7.27/svdrp.c 2012-03-04 13:05:56.000000000 +0100 +++ vdr-1.7.28/svdrp.c 2012-05-12 13:55:18.000000000 +0200 @@ -432,7 +432,7 @@ if (Code != 0) { va_list ap; va_start(ap, fmt); - cString buffer = cString::sprintf(fmt, ap); + cString buffer = cString::vsprintf(fmt, ap); va_end(ap); const char *s = buffer; while (s && *s) { --- vdr-1.7.27/thread.c 2009-04-13 15:50:39.000000000 +0200 +++ vdr-1.7.28/thread.c 2012-05-08 13:15:57.000000000 +0200 @@ -239,7 +239,7 @@ if (Description) { va_list ap; va_start(ap, Description); - description = strdup(cString::sprintf(Description, ap)); + description = strdup(cString::vsprintf(Description, ap)); va_end(ap); } } --- vdr-1.7.27/tools.c 2012-02-18 16:30:35.000000000 +0100 +++ vdr-1.7.28/tools.c 2012-05-12 15:29:20.000000000 +0200 @@ -958,7 +958,7 @@ return cString(buffer, true); }
-cString cString::sprintf(const char *fmt, va_list &ap) +cString cString::vsprintf(const char *fmt, va_list &ap) { char *buffer; if (!fmt || vasprintf(&buffer, fmt, ap) < 0) { --- vdr-1.7.27/tools.h 2012-02-29 11:41:00.000000000 +0100 +++ vdr-1.7.28/tools.h 2012-05-20 15:58:06.000000000 +0200 @@ -177,7 +177,7 @@ cString &operator=(const char *String); cString &Truncate(int Index); ///< Truncate the string at the given Index (if Index is < 0 it is counted from the end of the string). static cString sprintf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); - static cString sprintf(const char *fmt, va_list &ap); + static cString vsprintf(const char *fmt, va_list &ap); };
ssize_t safe_read(int filedes, void *buffer, size_t size);
Klaus