summaryrefslogtreecommitdiff
path: root/innobase/ut
diff options
context:
space:
mode:
authormarko@hundin.mysql.fi <>2004-05-20 01:32:02 +0300
committermarko@hundin.mysql.fi <>2004-05-20 01:32:02 +0300
commit40711b570a309be2894dad7872cd8eb05978e693 (patch)
tree5ed9e3881abe5f327c3313dff3736609f350880f /innobase/ut
parent192eb65e26a3dca2659fec54ce9b3935f205fc4c (diff)
downloadmariadb-git-40711b570a309be2894dad7872cd8eb05978e693.tar.gz
InnoDB cleanup: Remove unused functions ut_sprintf() and ut_fprintf()
Diffstat (limited to 'innobase/ut')
-rw-r--r--innobase/ut/ut0ut.c148
1 files changed, 0 insertions, 148 deletions
diff --git a/innobase/ut/ut0ut.c b/innobase/ut/ut0ut.c
index cce98cf5644..39850227162 100644
--- a/innobase/ut/ut0ut.c
+++ b/innobase/ut/ut0ut.c
@@ -30,154 +30,6 @@ mysql_get_identifier_quote_char(void);
used in SQL identifiers */
/************************************************************
-On the 64-bit Windows we substitute the format string
-%l -> %I64
-because we define ulint as unsigned __int64 and lint as __int64 on Windows,
-and both the Microsoft and Intel C compilers require the format string
-%I64 in that case instead of %l. */
-
-int
-ut_sprintf(
-/*=======*/
- /* out: the number of characters written, or
- negative in case of an error */
- char* buf, /* in: buffer where to print */
- const char* format, /* in: format of prints */
- ...) /* in: arguments to be printed */
-{
- va_list args;
- ulint len;
- char* format_end;
- char* newformat;
- char* ptr;
- char* newptr;
- int ret;
- char format_buf_in_stack[500];
-
- len = strlen(format);
-
- if (len > 250) {
- newformat = malloc(2 * len);
- } else {
- newformat = format_buf_in_stack;
- }
-
- format_end = (char*)format + len;
-
- ptr = (char*)format;
- newptr = newformat;
-
-#if defined(__WIN__) && (defined(WIN64) || defined(_WIN64))
- /* Replace %l with %I64 if it is not preceded with '\' */
-
- while (ptr < format_end) {
- if (*ptr == '%' && *(ptr + 1) == 'l'
- && (ptr == format || *(ptr - 1) != '\\')) {
-
- memcpy(newptr, "%I64", 4);
- ptr += 2;
- newptr += 4;
- } else {
- *newptr = *ptr;
- ptr++;
- newptr++;
- }
- }
-
- *newptr = '\0';
-
- ut_a(newptr < newformat + 2 * len);
-#else
- strcpy(newformat, format);
-#endif
- va_start(args, format);
-
- ret = vsprintf(buf, (const char*)newformat, args);
-
- va_end(args);
-
- if (newformat != format_buf_in_stack) {
- free(newformat);
- }
-
- return(ret);
-}
-
-/************************************************************
-On the 64-bit Windows we substitute the format string
-%l -> %I64
-because we define ulint as unsigned __int64 and lint as __int64 on Windows,
-and both the Microsoft and Intel C compilers require the format string
-%I64 in that case instead of %l. */
-
-int
-ut_fprintf(
-/*=======*/
- /* out: the number of characters written, or
- negative in case of an error */
- FILE* stream, /* in: stream where to print */
- const char* format, /* in: format of prints */
- ...) /* in: arguments to be printed */
-{
- va_list args;
- ulint len;
- char* format_end;
- char* newformat;
- char* ptr;
- char* newptr;
- int ret;
- char format_buf_in_stack[500];
-
- len = strlen(format);
-
- if (len > 250) {
- newformat = malloc(2 * len);
- } else {
- newformat = format_buf_in_stack;
- }
-
- format_end = (char*)format + len;
-
- ptr = (char*)format;
- newptr = newformat;
-
-#if defined(__WIN__) && (defined(WIN64) || defined(_WIN64))
- /* Replace %l with %I64 if it is not preceded with '\' */
-
- while (ptr < format_end) {
- if (*ptr == '%' && *(ptr + 1) == 'l'
- && (ptr == format || *(ptr - 1) != '\\')) {
-
- memcpy(newptr, "%I64", 4);
- ptr += 2;
- newptr += 4;
- } else {
- *newptr = *ptr;
- ptr++;
- newptr++;
- }
- }
-
- *newptr = '\0';
-
- ut_a(newptr < newformat + 2 * len);
-#else
- strcpy(newformat, format);
-#endif
- va_start(args, format);
-
- ret = vfprintf(stream, (const char*)newformat, args);
-
- va_end(args);
-
- if (newformat != format_buf_in_stack) {
- free(newformat);
- }
-
- return(ret);
-}
-
-/************************************************************
Gets the high 32 bits in a ulint. That is makes a shift >> 32,
but since there seem to be compiler bugs in both gcc and Visual C++,
we do this by a special conversion. */