Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
	* 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>
  • Loading branch information
Ulrich Drepper committed Mar 1, 2003
1 parent a6861e6 commit 85c54a3
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
13 changes: 13 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
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.
Expand Down
4 changes: 2 additions & 2 deletions argp/argp.h
Original file line number Diff line number Diff line change
@@ -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>.
Expand Down Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion manual/terminal.texi
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions posix/regexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 85c54a3

Please sign in to comment.