]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
maint: remove local gnulib-related patches
authorJim Meyering <meyering@redhat.com>
Tue, 17 Nov 2009 14:33:00 +0000 (15:33 +0100)
committerJim Meyering <meyering@redhat.com>
Tue, 17 Nov 2009 20:44:37 +0000 (21:44 +0100)
* gl/lib/printf-args.c.diff: Remove file.  No longer needed.
* gl/lib/vasnprintf.c.diff: Likewise.

gl/lib/printf-args.c.diff [deleted file]
gl/lib/vasnprintf.c.diff [deleted file]

diff --git a/gl/lib/printf-args.c.diff b/gl/lib/printf-args.c.diff
deleted file mode 100644 (file)
index 952d741..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/lib/printf-args.c b/lib/printf-args.c
-index 4978914..e994239 100644
---- a/lib/printf-args.c
-+++ b/lib/printf-args.c
-@@ -1,5 +1,6 @@
- /* Decomposed printf argument list.
--   Copyright (C) 1999, 2002-2003, 2005-2007 Free Software Foundation, Inc.
-+   Copyright (C) 1999, 2002-2003, 2005-2007, 2009 Free Software
-+   Foundation, Inc.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -89,7 +90,7 @@ PRINTF_FETCHARGS (va_list args, arguments *a)
-          where wint_t is 'unsigned short'.  */
-       ap->a.a_wide_char =
-         (sizeof (wint_t) < sizeof (int)
--         ? va_arg (args, int)
-+         ? (wint_t) va_arg (args, int)
-          : va_arg (args, wint_t));
-       break;
- #endif
diff --git a/gl/lib/vasnprintf.c.diff b/gl/lib/vasnprintf.c.diff
deleted file mode 100644 (file)
index eb48ab0..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
-index 661445c..ab66288 100644
---- a/lib/vasnprintf.c
-+++ b/lib/vasnprintf.c
-@@ -2375,16 +2375,16 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
-                     characters = 0;
-                     while (precision > 0)
-                       {
--                        char buf[64]; /* Assume MB_CUR_MAX <= 64.  */
-+                        char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
-                         int count;
-
-                         if (*arg_end == 0)
-                           /* Found the terminating null wide character.  */
-                           break;
- #  if HAVE_WCRTOMB
--                        count = wcrtomb (buf, *arg_end, &state);
-+                        count = wcrtomb (cbuf, *arg_end, &state);
- #  else
--                        count = wctomb (buf, *arg_end);
-+                        count = wctomb (cbuf, *arg_end);
- #  endif
-                         if (count < 0)
-                           {
-@@ -2420,16 +2420,16 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
-                     characters = 0;
-                     for (;;)
-                       {
--                        char buf[64]; /* Assume MB_CUR_MAX <= 64.  */
-+                        char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
-                         int count;
-
-                         if (*arg_end == 0)
-                           /* Found the terminating null wide character.  */
-                           break;
- #  if HAVE_WCRTOMB
--                        count = wcrtomb (buf, *arg_end, &state);
-+                        count = wcrtomb (cbuf, *arg_end, &state);
- #  else
--                        count = wctomb (buf, *arg_end);
-+                        count = wctomb (cbuf, *arg_end);
- #  endif
-                         if (count < 0)
-                           {
-@@ -2470,20 +2470,20 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- #   endif
-                   for (remaining = characters; remaining > 0; )
-                     {
--                      char buf[64]; /* Assume MB_CUR_MAX <= 64.  */
-+                      char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
-                       int count;
-
-                       if (*arg == 0)
-                         abort ();
- #   if HAVE_WCRTOMB
--                      count = wcrtomb (buf, *arg, &state);
-+                      count = wcrtomb (cbuf, *arg, &state);
- #   else
--                      count = wctomb (buf, *arg);
-+                      count = wctomb (cbuf, *arg);
- #   endif
-                       if (count <= 0)
-                         /* Inconsistency.  */
-                         abort ();
--                      memcpy (tmpptr, buf, count);
-+                      memcpy (tmpptr, cbuf, count);
-                       tmpptr += count;
-                       arg++;
-                       remaining -= count;
-@@ -2552,20 +2552,20 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
-                     ENSURE_ALLOCATION (xsum (length, characters));
-                     for (remaining = characters; remaining > 0; )
-                       {
--                        char buf[64]; /* Assume MB_CUR_MAX <= 64.  */
-+                        char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
-                         int count;
-
-                         if (*arg == 0)
-                           abort ();
- #   if HAVE_WCRTOMB
--                        count = wcrtomb (buf, *arg, &state);
-+                        count = wcrtomb (cbuf, *arg, &state);
- #   else
--                        count = wctomb (buf, *arg);
-+                        count = wctomb (cbuf, *arg);
- #   endif
-                         if (count <= 0)
-                           /* Inconsistency.  */
-                           abort ();
--                        memcpy (result + length, buf, count);
-+                        memcpy (result + length, cbuf, count);
-                         length += count;
-                         arg++;
-                         remaining -= count;
-@@ -2581,21 +2581,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- #   endif
-                     while (arg < arg_end)
-                       {
--                        char buf[64]; /* Assume MB_CUR_MAX <= 64.  */
-+                        char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
-                         int count;
-
-                         if (*arg == 0)
-                           abort ();
- #   if HAVE_WCRTOMB
--                        count = wcrtomb (buf, *arg, &state);
-+                        count = wcrtomb (cbuf, *arg, &state);
- #   else
--                        count = wctomb (buf, *arg);
-+                        count = wctomb (cbuf, *arg);
- #   endif
-                         if (count <= 0)
-                           /* Inconsistency.  */
-                           abort ();
-                         ENSURE_ALLOCATION (xsum (length, count));
--                        memcpy (result + length, buf, count);
-+                        memcpy (result + length, cbuf, count);
-                         length += count;
-                         arg++;
-                       }