diff options
| author | Roland McGrath <roland@gnu.org> | 2005-01-19 19:26:29 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-01-19 19:26:29 +0000 |
| commit | f9f7fcbe4703a9709fdd87aa4124436e70af1c1a (patch) | |
| tree | f9f34698d5df4f8215fde7a63c816fb4315cf157 | |
| parent | 1d038b6bb27e421c593e79f860f1a41c7d1c7a5d (diff) | |
| download | glibc-f9f7fcbe4703a9709fdd87aa4124436e70af1c1a.tar.gz glibc-f9f7fcbe4703a9709fdd87aa4124436e70af1c1a.tar.xz glibc-f9f7fcbe4703a9709fdd87aa4124436e70af1c1a.zip | |
* hurd/sigunwind.c (_hurdsig_longjmp_from_handler): Fix a typo
in assert. * iconv/strtab.c (strtabfinalize): Likewise. * libio/iofopncook.c (_IO_cookie_seekoff): Add prototype.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | hurd/sigunwind.c | 4 | ||||
| -rw-r--r-- | iconv/strtab.c | 4 | ||||
| -rw-r--r-- | libio/iofopncook.c | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 3735a8a94f..d87d4dfef9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-01-19 Jakub Jelinek <jakub@redhat.com> + + * hurd/sigunwind.c (_hurdsig_longjmp_from_handler): Fix a typo + in assert. + * iconv/strtab.c (strtabfinalize): Likewise. + + * libio/iofopncook.c (_IO_cookie_seekoff): Add prototype. + 2005-01-17 Roland McGrath <roland@redhat.com> * nscd/Makefile (LDLIBS-nscd): New variable. diff --git a/hurd/sigunwind.c b/hurd/sigunwind.c index 450a385a2a..1c6489b3b3 100644 --- a/hurd/sigunwind.c +++ b/hurd/sigunwind.c @@ -1,5 +1,5 @@ /* longjmp cleanup function for unwinding past signal handlers. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998, 2005 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 @@ -111,7 +111,7 @@ _hurdsig_longjmp_from_handler (void *data, jmp_buf env, int val) link = (void *) &scp[1]; assert (! link->resource.next && ! link->resource.prevp); assert (link->thread.next == ss->active_resources); - assert (link->thread.prevp = &ss->active_resources); + assert (link->thread.prevp == &ss->active_resources); if (link->thread.next) link->thread.next->thread.prevp = &link->thread.next; ss->active_resources = link; diff --git a/iconv/strtab.c b/iconv/strtab.c index e6feb2cf24..4a8f29a675 100644 --- a/iconv/strtab.c +++ b/iconv/strtab.c @@ -1,5 +1,5 @@ /* C string table handling. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc. Written by Ulrich Drepper <drepper@redhat.com>, 2000. This program is free software; you can redistribute it and/or modify @@ -326,7 +326,7 @@ strtabfinalize (struct Strtab *st, size_t *size) copylen = 1; copystrings (st->root, &endp, ©len); assert (copylen == st->total + 1); - assert (endp = retval + st->total + 1); + assert (endp == retval + st->total + 1); *size = copylen; return retval; diff --git a/libio/iofopncook.c b/libio/iofopncook.c index eba3d435dc..9c5503d1f2 100644 --- a/libio/iofopncook.c +++ b/libio/iofopncook.c @@ -37,6 +37,8 @@ static _IO_ssize_t _IO_cookie_read (register _IO_FILE* fp, void* buf, static _IO_ssize_t _IO_cookie_write (register _IO_FILE* fp, const void* buf, _IO_ssize_t size); static _IO_off64_t _IO_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir); +static _IO_off64_t _IO_cookie_seekoff (_IO_FILE *fp, _IO_off64_t offset, + int dir, int mode); static int _IO_cookie_close (_IO_FILE* fp); static _IO_ssize_t |