OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Formatting fixes

This commit is contained in:
Ulrich Drepper 2012-03-06 21:45:53 -05:00
parent a53b7a4e4b
commit f72ed77d71
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,7 @@
2012-03-06 Ulrich Drepper <drepper@gmail.com>
* stdio-common/vfprintf.c: Fix formatting. Missing copyright update.
2012-03-06 Marek Polacek <polacek@redhat.com>
[BZ #13726]
@ -12,9 +16,10 @@
(set_obp_int): New function.
(get_obp_int): New function.
(__get_clockfreq_via_dev_openprom): Likewise.
* sysdeps/unix/sysv/linux/sparc/sysdep.h (INTERNAL_SYSCALL_ERROR_P): Avoid
unused variable warnings on 'val' and use builtin_expect.
(INLINE_SYSCALL): Don't wrap INTERNAL_SYSCALL_ERROR_P with builtin_expect.
* sysdeps/unix/sysv/linux/sparc/sysdep.h (INTERNAL_SYSCALL_ERROR_P):
Avoid unused variable warnings on 'val' and use builtin_expect.
(INLINE_SYSCALL): Don't wrap INTERNAL_SYSCALL_ERROR_P with
__builtin_expect.
(INLINE_CLONE_SYSCALL): Likewise.
2012-03-05 David S. Miller <davem@davemloft.net>

26
stdio-common/vfprintf.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
/* Copyright (C) 1991-2011, 2012 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
@ -1706,28 +1706,28 @@ do_positional:
nargs = MAX (nargs, max_ref_arg);
/* Calculate total size needed to represent a single argument across
all three argument-related arrays. */
bytes_per_arg = sizeof (*args_value) + sizeof (*args_size)
+ sizeof (*args_type);
bytes_per_arg = (sizeof (*args_value) + sizeof (*args_size)
+ sizeof (*args_type));
/* Check for potential integer overflow. */
if (__builtin_expect (nargs > SIZE_MAX / bytes_per_arg, 0))
{
__set_errno (ERANGE);
done = -1;
goto all_done;
__set_errno (ERANGE);
done = -1;
goto all_done;
}
/* Allocate memory for all three argument arrays. */
if (__libc_use_alloca (nargs * bytes_per_arg))
args_value = alloca (nargs * bytes_per_arg);
args_value = alloca (nargs * bytes_per_arg);
else
{
args_value = args_malloced = malloc (nargs * bytes_per_arg);
if (args_value == NULL)
{
done = -1;
goto all_done;
}
args_value = args_malloced = malloc (nargs * bytes_per_arg);
if (args_value == NULL)
{
done = -1;
goto all_done;
}
}
/* Set up the remaining two arrays to each point past the end of the