diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:29:38 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:29:38 +0000 |
commit | 7c7d34a16f08f84427b3f617313d9633423ad5eb (patch) | |
tree | 2c1ac6a7e6b47a49228b905f12b3604dfa4d1dc3 /libio/vsnprintf.c | |
parent | 6772d640a4f4874166a61f1859e1660a2913a89d (diff) | |
parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) |
Merge commit 'refs/top-bases/t/hurdsig-fixes' into t/hurdsig-fixes
Diffstat (limited to 'libio/vsnprintf.c')
-rw-r--r-- | libio/vsnprintf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libio/vsnprintf.c b/libio/vsnprintf.c index f1063a17be..39b5500528 100644 --- a/libio/vsnprintf.c +++ b/libio/vsnprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994-2016 Free Software Foundation, Inc. +/* Copyright (C) 1994-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 @@ -27,10 +27,10 @@ #include "libioP.h" #include "strfile.h" -static int _IO_strn_overflow (_IO_FILE *fp, int c) __THROW; +static int _IO_strn_overflow (FILE *fp, int c) __THROW; static int -_IO_strn_overflow (_IO_FILE *fp, int c) +_IO_strn_overflow (FILE *fp, int c) { /* When we come to here this means the user supplied buffer is filled. But since we must return the number of characters which @@ -64,7 +64,7 @@ _IO_strn_overflow (_IO_FILE *fp, int c) } -const struct _IO_jump_t _IO_strn_jumps attribute_hidden = +const struct _IO_jump_t _IO_strn_jumps libio_vtable attribute_hidden = { JUMP_INIT_DUMMY, JUMP_INIT(finish, _IO_str_finish), @@ -90,8 +90,8 @@ const struct _IO_jump_t _IO_strn_jumps attribute_hidden = int -_IO_vsnprintf (char *string, _IO_size_t maxlen, const char *format, - _IO_va_list args) +_IO_vsnprintf (char *string, size_t maxlen, const char *format, + va_list args) { _IO_strnfile sf; int ret; |