Prepare vfscanf to use __strtof128_internal

[thirdparty/glibc.git] / stdio-common / reg-printf.c

diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c
index 672652ab208a5e4512f7c56933fac8e4da1750f8..35db28aa333515e7fafbf1befede6eb524d2649b 100644 (file)
--- a/stdio-common/reg-printf.c
+++ b/stdio-common/reg-printf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -12,30 +12,35 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <limits.h>
 #include <printf.h>
 #include <stddef.h>
 #include <stdlib.h>
+#include <libc-lock.h>
+
 
 /* Array of functions indexed by format character.  */
-libc_freeres_ptr (printf_arginfo_function **__printf_arginfo_table)
+libc_freeres_ptr (printf_arginfo_size_function **__printf_arginfo_table)
   attribute_hidden;
 printf_function **__printf_function_table attribute_hidden;
 
-int __register_printf_function __P ((int, printf_function,
-                                     printf_arginfo_function));
+__libc_lock_define_initialized (static, lock)
+
+int __register_printf_specifier (int, printf_function,
+                                printf_arginfo_size_function);
+libc_hidden_proto (__register_printf_specifier)
+int __register_printf_function (int, printf_function,
+                               printf_arginfo_function);
+
 
 /* Register FUNC to be called to format SPEC specifiers.  */
 int
-__register_printf_function (spec, converter, arginfo)
-     int spec;
-     printf_function converter;
-     printf_arginfo_function arginfo;
+__register_printf_specifier (int spec, printf_function converter,
+                            printf_arginfo_size_function arginfo)
 {
   if (spec < 0 || spec > (int) UCHAR_MAX)
     {
@@ -43,12 +48,19 @@ __register_printf_function (spec, converter, arginfo)
       return -1;
     }
 
+  int result = 0;
+  __libc_lock_lock (lock);
+
   if (__printf_function_table == NULL)
     {
-      __printf_arginfo_table = (printf_arginfo_function **)
-       malloc ((UCHAR_MAX + 1) * sizeof (void *) * 2);
+      __printf_arginfo_table = (printf_arginfo_size_function **)
+       calloc (UCHAR_MAX + 1, sizeof (void *) * 2);
       if (__printf_arginfo_table == NULL)
-       return -1;
+       {
+         result = -1;
+         goto out;
+       }
+
       __printf_function_table = (printf_function **)
        (__printf_arginfo_table + UCHAR_MAX + 1);
     }
@@ -56,6 +68,21 @@ __register_printf_function (spec, converter, arginfo)
   __printf_function_table[spec] = converter;
   __printf_arginfo_table[spec] = arginfo;
 
-  return 0;
+ out:
+  __libc_lock_unlock (lock);
+
+  return result;
+}
+libc_hidden_def (__register_printf_specifier)
+weak_alias (__register_printf_specifier, register_printf_specifier)
+
+
+/* Register FUNC to be called to format SPEC specifiers.  */
+int
+__register_printf_function (int spec, printf_function converter,
+                           printf_arginfo_function arginfo)
+{
+  return __register_printf_specifier (spec, converter,
+                                     (printf_arginfo_size_function*) arginfo);
 }
 weak_alias (__register_printf_function, register_printf_function)