diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | argp/argp.h | 4 | ||||
| -rw-r--r-- | manual/terminal.texi | 2 | ||||
| -rw-r--r-- | posix/regexec.c | 7 |
4 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index b936385d26..149f382f90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2003-03-01 GOTO Masanori <gotom@debian.or.jp> + * argp/argp.h: Fix a typo. + Reported by H.S.Teoh <hsteoh@quickfur.ath.cx>. + + * manual/terminal.texi: Fix cfmakeraw() definition from int to void. + +2003-02-27 Pat Rankin <rankin@pactechdata.com> + + * posix/regexec.c (proceed_next_node): Cast re_string_get_buffer to + char *. + (get_subexp): Likewise. + +2003-03-01 GOTO Masanori <gotom@debian.or.jp> + * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (O_DIRECT): Define. 2003-02-26 Steven Munroe <sjmunroe@us.ibm.com> diff --git a/argp/argp.h b/argp/argp.h index 9fa9784045..04b4e92806 100644 --- a/argp/argp.h +++ b/argp/argp.h @@ -1,5 +1,5 @@ /* Hierarchial argument parsing, layered over getopt. - Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1998,1999,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles@gnu.ai.mit.edu>. @@ -96,7 +96,7 @@ struct argp_option is set, then the option NAME field is displayed unmodified (e.g., no `--' prefix is added) at the left-margin (where a *short* option would normally be displayed), and the documentation string in the normal place. For - purposes of sorting, any leading whitespace and puncuation is ignored, + purposes of sorting, any leading whitespace and punctuation is ignored, except that if the first non-whitespace character is not `-', this entry is displayed after all options (and OPTION_DOC entries with a leading `-') in the same group. */ diff --git a/manual/terminal.texi b/manual/terminal.texi index 7a9952901c..96edcf0513 100644 --- a/manual/terminal.texi +++ b/manual/terminal.texi @@ -1617,7 +1617,7 @@ uses. @comment termios.h @comment BSD -@deftypefun int cfmakeraw (struct termios *@var{termios-p}) +@deftypefun void cfmakeraw (struct termios *@var{termios-p}) This function provides an easy way to set up @code{*@var{termios-p}} for what has traditionally been called ``raw mode'' in BSD. This uses noncanonical input, and turns off most processing to give an unmodified diff --git a/posix/regexec.c b/posix/regexec.c index eb16baabea..6ea14a6c48 100644 --- a/posix/regexec.c +++ b/posix/regexec.c @@ -1171,7 +1171,7 @@ proceed_next_node (preg, nregs, regs, mctx, pidx, node, eps_via_nodes, fs) return -1; else if (naccepted) { - char *buf = re_string_get_buffer (mctx->input); + char *buf = (char *) re_string_get_buffer (mctx->input); if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, naccepted) != 0) return -1; @@ -2468,7 +2468,7 @@ get_subexp (preg, mctx, bkref_node, bkref_str_idx) { int subexp_num, sub_top_idx; re_dfa_t *dfa = (re_dfa_t *) preg->buffer; - char *buf = re_string_get_buffer (mctx->input); + char *buf = (char *) re_string_get_buffer (mctx->input); /* Return if we have already checked BKREF_NODE at BKREF_STR_IDX. */ int cache_idx = search_cur_bkref_entry (mctx, bkref_str_idx); for (; cache_idx < mctx->nbkref_ents; ++cache_idx) @@ -3459,7 +3459,8 @@ check_node_accept_bytes (preg, node_idx, input, str_idx) { const re_charset_t *cset = node->opr.mbcset; # ifdef _LIBC - const unsigned char *pin = re_string_get_buffer (input) + str_idx; + const unsigned char *pin = ((char *) re_string_get_buffer (input) + + str_idx); # endif /* _LIBC */ int match_len = 0; wchar_t wc = ((cset->nranges || cset->nchar_classes || cset->nmbchars) |