1c1
< /* $FreeBSD: head/contrib/libreadline/util.c 58314 2000-03-19 22:00:57Z ache $ */
---
> /* $FreeBSD: head/contrib/libreadline/util.c 75409 2001-04-11 03:15:56Z ache $ */
71c71
< static char *pathname_alphabetic_chars = "/-_=~.#$";
---
> static const char *pathname_alphabetic_chars = "/-_=~.#$";
74c74
< alphabetic (c)
---
> rl_alphabetic (c)
88c88
< ding ();
---
> rl_ding ();
91c91
< rl_pending_input = 0;
---
> rl_clear_pending_input ();
94c94
< while (_rl_executing_macro)
---
> while (rl_executing_macro)
97c97
< rl_last_func = (Function *)NULL;
---
> rl_last_func = (rl_command_func_t *)NULL;
117c117
< ding ();
---
> rl_ding ();
219c219
< register char *s1, *s2;
---
> register const char *s1, *s2;
225c225
< return (s1 + i);
---
> return ((char *) (s1 + i));
228a229,250
> /* Find the first occurrence in STRING1 of any character from STRING2.
> Return a pointer to the character in STRING1. */
> char *
> _rl_strpbrk (string1, string2)
> const char *string1, *string2;
> {
> register const char *scan;
>
> if (string2 == NULL)
> return ((char *)NULL);
>
> for (; *string1; string1++)
> {
> for (scan = string2; *scan; scan++)
> {
> if (*string1 == *scan)
> return ((char *)string1);
> }
> }
> return ((char *)NULL);
> }
>
349c371
< char *s;
---
> const char *s;
351c373
< return ((char *)strcpy (xmalloc (1 + (int)strlen (s)), (s)));
---
> return (strcpy (xmalloc (1 + (int)strlen (s)), (s)));
< /* $FreeBSD: head/contrib/libreadline/util.c 58314 2000-03-19 22:00:57Z ache $ */
---
> /* $FreeBSD: head/contrib/libreadline/util.c 75409 2001-04-11 03:15:56Z ache $ */
71c71
< static char *pathname_alphabetic_chars = "/-_=~.#$";
---
> static const char *pathname_alphabetic_chars = "/-_=~.#$";
74c74
< alphabetic (c)
---
> rl_alphabetic (c)
88c88
< ding ();
---
> rl_ding ();
91c91
< rl_pending_input = 0;
---
> rl_clear_pending_input ();
94c94
< while (_rl_executing_macro)
---
> while (rl_executing_macro)
97c97
< rl_last_func = (Function *)NULL;
---
> rl_last_func = (rl_command_func_t *)NULL;
117c117
< ding ();
---
> rl_ding ();
219c219
< register char *s1, *s2;
---
> register const char *s1, *s2;
225c225
< return (s1 + i);
---
> return ((char *) (s1 + i));
228a229,250
> /* Find the first occurrence in STRING1 of any character from STRING2.
> Return a pointer to the character in STRING1. */
> char *
> _rl_strpbrk (string1, string2)
> const char *string1, *string2;
> {
> register const char *scan;
>
> if (string2 == NULL)
> return ((char *)NULL);
>
> for (; *string1; string1++)
> {
> for (scan = string2; *scan; scan++)
> {
> if (*string1 == *scan)
> return ((char *)string1);
> }
> }
> return ((char *)NULL);
> }
>
349c371
< char *s;
---
> const char *s;
351c373
< return ((char *)strcpy (xmalloc (1 + (int)strlen (s)), (s)));
---
> return (strcpy (xmalloc (1 + (int)strlen (s)), (s)));