diff options
| author | Pedro Alves <palves@redhat.com> | 2010-05-23 00:57:01 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2010-05-23 00:57:01 +0000 |
| commit | f434ba0309555deb86dc8b6da65ea67d588bda30 (patch) | |
| tree | e6037837cb9d1eb5424a46c4ce6f9d1d91525eb1 /gdb/gnulib/memmem.c | |
| parent | 528b55c0a00cc561956d2dbf2b035bb751331cc1 (diff) | |
| download | gdb-f434ba0309555deb86dc8b6da65ea67d588bda30.zip gdb-f434ba0309555deb86dc8b6da65ea67d588bda30.tar.gz gdb-f434ba0309555deb86dc8b6da65ea67d588bda30.tar.bz2 | |
gdb/
2010-05-23 Pedro Alves <pedro@codesourcery.com>
Update gnulib from latest git.
(250b80067c1e1d8faa0c42fb572f721975b929c5)
* gnulib/memcmp.c: Removed.
* gnulib/memchr.valgrind: New.
* gnulib/stddef.in.h: New.
* gnulib/Makefile.am: Updated.
* gnulib/memchr.c: Updated.
* gnulib/memmem.c: Updated.
* gnulib/stdint.in.h: Updated.
* gnulib/str-two-way.h: Updated.
* gnulib/string.in.h: Updated.
* gnulib/wchar.in.h: Updated.
* gnulib/extra/link-warning.h: Removed.
* gnulib/extra/c++defs.h: New.
* gnulib/extra/warn-on-use.h: New.
* gnulib/extra/arg-nonnull.h: Updated.
* gnulib/m4/extensions.m4: Updated.
* gnulib/m4/gnulib-cache.m4: Updated.
* gnulib/m4/gnulib-common.m4: Updated.
* gnulib/m4/gnulib-comp.m4: Updated.
* gnulib/m4/gnulib-tool.m4: Updated.
* gnulib/m4/include_next.m4: Updated.
* gnulib/m4/longlong.m4: Updated.
* gnulib/m4/memchr.m4: Updated.
* gnulib/m4/memmem.m4: Updated.
* gnulib/m4/stdint.m4: Updated.
* gnulib/m4/string_h.m4: Updated.
* gnulib/m4/memcmp.m4: Removed.
* gnulib/m4/onceonly_2_57.m4: Removed.
* gnulib/m4/00gnulib.m4: New.
* gnulib/m4/mmap-anon.m4: New.
* gnulib/m4/multiarch.m4: New.
* gnulib/m4/onceonly.m4: New.
* gnulib/m4/stddef_h.m4: New.
* gnulib/m4/warn-on-use.m4: New.
* gnulib/m4/wchar.m4: Removed.
* gnulib/m4/wchar_h.m4: New.
* gnulib/m4/wchar_t.m4: New.
* gnulib/m4/wint_t.m4: New.
* aclocal.m4: Regenerate.
* config.in: Likewise.
* configure: Likewise.
* gnulib/Makefile.in: Likewise.
gdb/gdbserver/
2010-05-23 Pedro Alves <pedro@codesourcery.com>
* config.h, configure: Regenerate.
Diffstat (limited to 'gdb/gnulib/memmem.c')
| -rw-r--r-- | gdb/gnulib/memmem.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdb/gnulib/memmem.c b/gdb/gnulib/memmem.c index 1324a3e..a23c4f7 100644 --- a/gdb/gnulib/memmem.c +++ b/gdb/gnulib/memmem.c @@ -1,5 +1,5 @@ -/* Copyright (C) 1991,92,93,94,96,97,98,2000,2004,2007,2008,2009,2010 -Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000, 2004, 2007, + 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -38,7 +38,7 @@ Free Software Foundation, Inc. HAYSTACK. */ void * memmem (const void *haystack_start, size_t haystack_len, - const void *needle_start, size_t needle_len) + const void *needle_start, size_t needle_len) { /* Abstract memory is considered to be an array of 'unsigned char' values, not an array of 'char' values. See ISO C 99 section 6.2.6.1. */ @@ -63,10 +63,10 @@ memmem (const void *haystack_start, size_t haystack_len, { haystack = memchr (haystack, *needle, haystack_len); if (!haystack || __builtin_expect (needle_len == 1, 0)) - return (void *) haystack; + return (void *) haystack; haystack_len -= haystack - (const unsigned char *) haystack_start; if (haystack_len < needle_len) - return NULL; + return NULL; return two_way_short_needle (haystack, haystack_len, needle, needle_len); } else |