69 lines
2.5 KiB
Diff
69 lines
2.5 KiB
Diff
|
Submitted By: David Shust (www.shustring.com)
|
||
|
|
Date: 2003-08-15
|
||
|
|
Initial Package Version: 2.3.2
|
||
|
|
Origin: glibc CVS changes performed by Roland McGrath
|
||
|
|
Description: patches stdio-common/sscanf.c, libio/{swprintf.c, swscanf.c}
|
||
|
|
|
||
|
|
diff -Naur glibc-2.3.2/libio/swprintf.c glibc-2.3.2-new/libio/swprintf.c
|
||
|
|
--- glibc-2.3.2/libio/swprintf.c 2001-07-07 19:21:03.000000000 +0000
|
||
|
|
+++ glibc-2.3.2-new/libio/swprintf.c 2003-08-15 19:36:42.000000000 +0000
|
||
|
|
@@ -1,4 +1,5 @@
|
||
|
|
-/* Copyright (C) 1991,1995,1997,1998,1999,2000 Free Software Foundation, Inc.
|
||
|
|
+/* Copyright (C) 1991,1995,1997,1998,1999,2000,2003
|
||
|
|
+ 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
|
||
|
|
@@ -22,10 +23,7 @@
|
||
|
|
/* Write formatted output into S, according to the format string FORMAT. */
|
||
|
|
/* VARARGS3 */
|
||
|
|
int
|
||
|
|
-swprintf (s, n, format)
|
||
|
|
- wchar_t *s;
|
||
|
|
- size_t n;
|
||
|
|
- const wchar_t *format;
|
||
|
|
+swprintf (wchar_t *s, size_t n, const wchar_t *format, ...)
|
||
|
|
{
|
||
|
|
va_list arg;
|
||
|
|
int done;
|
||
|
|
diff -Naur glibc-2.3.2/libio/swscanf.c glibc-2.3.2-new/libio/swscanf.c
|
||
|
|
--- glibc-2.3.2/libio/swscanf.c 2001-07-07 19:21:03.000000000 +0000
|
||
|
|
+++ glibc-2.3.2-new/libio/swscanf.c 2003-08-15 19:36:42.000000000 +0000
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-/* Copyright (C) 1991, 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
|
||
|
|
+/* Copyright (C) 1991,1995,1996,1998,1999,2003 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
|
||
|
|
@@ -22,9 +22,7 @@
|
||
|
|
/* Read formatted input from S, according to the format string FORMAT. */
|
||
|
|
/* VARARGS2 */
|
||
|
|
int
|
||
|
|
-swscanf (s, format)
|
||
|
|
- const wchar_t *s;
|
||
|
|
- const wchar_t *format;
|
||
|
|
+swscanf (const wchar_t *s, const wchar_t *format, ...)
|
||
|
|
{
|
||
|
|
va_list arg;
|
||
|
|
int done;
|
||
|
|
diff -Naur glibc-2.3.2/stdio-common/sscanf.c glibc-2.3.2-new/stdio-common/sscanf.c
|
||
|
|
--- glibc-2.3.2/stdio-common/sscanf.c 2002-08-10 18:09:08.000000000 +0000
|
||
|
|
+++ glibc-2.3.2-new/stdio-common/sscanf.c 2003-08-15 19:36:24.000000000 +0000
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-/* Copyright (C) 1991,95,96,98,2002 Free Software Foundation, Inc.
|
||
|
|
+/* Copyright (C) 1991,1995,1996,1998,2002,2003 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,9 +27,7 @@
|
||
|
|
/* Read formatted input from S, according to the format string FORMAT. */
|
||
|
|
/* VARARGS2 */
|
||
|
|
int
|
||
|
|
-sscanf (s, format)
|
||
|
|
- const char *s;
|
||
|
|
- const char *format;
|
||
|
|
+sscanf (const char *s, const char *format, ...)
|
||
|
|
{
|
||
|
|
va_list arg;
|
||
|
|
int done;
|