* 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.
This commit is contained in:
Roland McGrath 2005-01-19 19:26:29 +00:00
parent 1d038b6bb2
commit f9f7fcbe47
4 changed files with 14 additions and 4 deletions

View File

@ -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> 2005-01-17 Roland McGrath <roland@redhat.com>
* nscd/Makefile (LDLIBS-nscd): New variable. * nscd/Makefile (LDLIBS-nscd): New variable.

View File

@ -1,5 +1,5 @@
/* longjmp cleanup function for unwinding past signal handlers. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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]; link = (void *) &scp[1];
assert (! link->resource.next && ! link->resource.prevp); assert (! link->resource.next && ! link->resource.prevp);
assert (link->thread.next == ss->active_resources); 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) if (link->thread.next)
link->thread.next->thread.prevp = &link->thread.next; link->thread.next->thread.prevp = &link->thread.next;
ss->active_resources = link; ss->active_resources = link;

View File

@ -1,5 +1,5 @@
/* C string table handling. /* 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. Written by Ulrich Drepper <drepper@redhat.com>, 2000.
This program is free software; you can redistribute it and/or modify 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; copylen = 1;
copystrings (st->root, &endp, &copylen); copystrings (st->root, &endp, &copylen);
assert (copylen == st->total + 1); assert (copylen == st->total + 1);
assert (endp = retval + st->total + 1); assert (endp == retval + st->total + 1);
*size = copylen; *size = copylen;
return retval; return retval;

View File

@ -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, static _IO_ssize_t _IO_cookie_write (register _IO_FILE* fp,
const void* buf, _IO_ssize_t size); 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_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 int _IO_cookie_close (_IO_FILE* fp);
static _IO_ssize_t static _IO_ssize_t