aboutsummaryrefslogtreecommitdiff
path: root/stdio-common/reg-printf.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-04-11 05:34:20 +0000
committerUlrich Drepper <drepper@redhat.com>2009-04-11 05:34:20 +0000
commit9d26efa90c6dcbcd6b3e586c9927b6058ef4d529 (patch)
treefc306e24bf4b956abba8782e78d4118639c46361 /stdio-common/reg-printf.c
parentf140a0d53d639c86408ac532091fb4644faa95c0 (diff)
downloadglibc-9d26efa90c6dcbcd6b3e586c9927b6058ef4d529.tar
glibc-9d26efa90c6dcbcd6b3e586c9927b6058ef4d529.tar.gz
glibc-9d26efa90c6dcbcd6b3e586c9927b6058ef4d529.tar.bz2
glibc-9d26efa90c6dcbcd6b3e586c9927b6058ef4d529.zip
* stdio-common/printf.h (struct printf_info): Add user element.
New types printf_arginfo_size_function, printf_va_arg_function. Declare register_printf_specifier, register_printf_modifier, register_printf_type. * stdio-common/printf-parse.h (struct printf_spec): Add size element. (union printf_arg): Add pa_user element. Adjust __printf_arginfo_table type. Add __printf_va_arg_table, __printf_modifier_table, __handle_registered_modifier_mb, and __handle_registered_modifier_wc declarations. * stdio-common/printf-parsemb.c: Recognize registered modifiers. If registered arginfo call failed try normal specifier. * stdio-common/printf-prs.c: Pass additional parameter to arginfo function. * stdio-common/Makefile (routines): Add reg-modifier and reg-type. * stdio-common/Versions: Export register_printf_modifier, register_printf_type, and register_printf_specifier for GLIBC_2.10. * stdio-common/reg-modifier.c: New file. * stdio-common/reg-type.c: New file. * stdio-common/reg-printf.c (__register_printf_specifier): New function. Mostly the old __register_printf_function function but uses locking and type of third parameter changed. (__register_printf_function): Implement using __register_printf_specifier. * stdio-common/vfprintf.c (vfprintf): Collect argument sizes in calls to arginfo functions. Allocate enough memory for user-defined types. Call new va_arg functions to get user-defined types. Try installed handlers even for existing format specifiers first.
Diffstat (limited to 'stdio-common/reg-printf.c')
-rw-r--r--stdio-common/reg-printf.c46
1 files changed, 38 insertions, 8 deletions
diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c
index dbb6234e5f..b5cab679de 100644
--- a/stdio-common/reg-printf.c
+++ b/stdio-common/reg-printf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1996,1997,2002,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1996,1997,2002-2004,2009 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
@@ -21,21 +21,28 @@
#include <printf.h>
#include <stddef.h>
#include <stdlib.h>
+#include <bits/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;
+__libc_lock_define_initialized (static, lock)
+
+int __register_printf_specifier (int, printf_function,
+ printf_arginfo_size_function);
int __register_printf_function (int, printf_function,
- printf_arginfo_function) __THROW;
+ printf_arginfo_function);
+
/* Register FUNC to be called to format SPEC specifiers. */
int
-__register_printf_function (spec, converter, arginfo)
+__register_printf_specifier (spec, converter, arginfo)
int spec;
printf_function converter;
- printf_arginfo_function arginfo;
+ printf_arginfo_size_function arginfo;
{
if (spec < 0 || spec > (int) UCHAR_MAX)
{
@@ -43,12 +50,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 **)
+ __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 +70,22 @@ __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;
+}
+weak_alias (__register_printf_specifier, register_printf_specifier)
+
+
+/* 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;
+{
+ return __register_printf_specifier (spec, converter,
+ (printf_arginfo_size_function*) arginfo);
}
weak_alias (__register_printf_function, register_printf_function)