Skip to content

Commit

Permalink
* hurd/sigunwind.c (_hurdsig_longjmp_from_handler): Fix a typo
Browse files Browse the repository at this point in the history
	in assert.
	* iconv/strtab.c (strtabfinalize): Likewise.

	* libio/iofopncook.c (_IO_cookie_seekoff): Add prototype.
  • Loading branch information
Roland McGrath committed Jan 19, 2005
1 parent 1d038b6 commit f9f7fcb
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2005-01-19 Jakub Jelinek <[email protected]>

* 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 <[email protected]>

* nscd/Makefile (LDLIBS-nscd): New variable.
Expand Down
4 changes: 2 additions & 2 deletions hurd/sigunwind.c
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions iconv/strtab.c
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>, 2000.
This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -326,7 +326,7 @@ strtabfinalize (struct Strtab *st, size_t *size)
copylen = 1;
copystrings (st->root, &endp, &copylen);
assert (copylen == st->total + 1);
assert (endp = retval + st->total + 1);
assert (endp == retval + st->total + 1);
*size = copylen;

return retval;
Expand Down
2 changes: 2 additions & 0 deletions libio/iofopncook.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f9f7fcb

Please sign in to comment.