Commit 9d249321 authored by bar@bar.mysql.r18.ru's avatar bar@bar.mysql.r18.ru

my_snprintf() doesn't support things like %04X so use vsprintf() instead

parent bb3a5f85
...@@ -123,6 +123,7 @@ int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc, ...@@ -123,6 +123,7 @@ int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc,
} }
#ifdef NOT_USED
static int my_vsnprintf_8bit(char *to, size_t n, const char* fmt, va_list ap) static int my_vsnprintf_8bit(char *to, size_t n, const char* fmt, va_list ap)
{ {
char *start=to, *end=to+n-1; char *start=to, *end=to+n-1;
...@@ -173,14 +174,22 @@ static int my_vsnprintf_8bit(char *to, size_t n, const char* fmt, va_list ap) ...@@ -173,14 +174,22 @@ static int my_vsnprintf_8bit(char *to, size_t n, const char* fmt, va_list ap)
*to='\0'; /* End of errmessage */ *to='\0'; /* End of errmessage */
return (uint) (to - start); return (uint) (to - start);
} }
#endif
int my_snprintf_8bit(CHARSET_INFO *cs __attribute__((unused)), int my_snprintf_8bit(CHARSET_INFO *cs __attribute__((unused)),
char* to, uint n, const char* fmt, ...) char* to, uint n __attribute__((unused)),
const char* fmt, ...)
{ {
va_list args; va_list args;
va_start(args,fmt); va_start(args,fmt);
#ifdef NOT_USED
return my_vsnprintf_8bit(to, n, fmt, args); return my_vsnprintf_8bit(to, n, fmt, args);
#endif
/*
FIXME: generally not safe, but it is OK for now
FIXME: as far as it's not called unsafely in the current code
*/
return vsprintf(to,fmt,args); /* FIXME */
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment