16,20c16
< * 3. All advertising materials mentioning features or use of this software
< * must display the following acknowledgement:
< * This product includes software developed by the University of
< * California, Berkeley and its contributors.
< * 4. Neither the name of the University nor the names of its contributors
---
> * 3. Neither the name of the University nor the names of its contributors
36c32
< * $NetBSD: refresh.c,v 1.16 2001/01/10 07:45:42 jdolecek Exp $
---
> * $NetBSD: refresh.c,v 1.26 2003/08/07 16:44:33 agc Exp $
43c39
< __FBSDID("$FreeBSD: head/lib/libedit/refresh.c 84334 2001-10-01 23:00:29Z obrien $");
---
> __FBSDID("$FreeBSD: head/lib/libedit/refresh.c 148834 2005-08-07 20:55:59Z stefanf $");
49a46
> #include <ctype.h>
61c58
< private void re__copy_and_pad(char *, char *, size_t);
---
> private void re__copy_and_pad(char *, const char *, size_t);
64c61
< private void re_printstr(EditLine *, char *, char *, char *);
---
> private void re_printstr(EditLine *, const char *, char *, char *);
67c64
< if (a) { \
---
> if (/*CONSTCOND*/ a) { \
71c68
< while (0)
---
> while (/*CONSTCOND*/0)
78c75
< re_printstr(EditLine *el, char *str, char *f, char *t)
---
> re_printstr(EditLine *el, const char *str, char *f, char *t)
99,100d95
< c = (unsigned char)c;
<
210a206,213
> if (el->el_line.cursor >= el->el_line.lastchar) {
> if (el->el_map.current == el->el_map.alt
> && el->el_line.lastchar != el->el_line.buffer)
> el->el_line.cursor = el->el_line.lastchar - 1;
> else
> el->el_line.cursor = el->el_line.lastchar;
> }
>
320d322
< term__putc('\r');
333c335,336
< re_insert(EditLine *el, char *d, int dat, int dlen, char *s, int num)
---
> re_insert(EditLine *el __unused,
> char *d, int dat, int dlen, char *s, int num)
376c379,380
< re_delete(EditLine *el, char *d, int dat, int dlen, int num)
---
> re_delete(EditLine *el __unused,
> char *d, int dat, int dlen, int num)
909c913
< re__copy_and_pad(char *dst, char *src, size_t width)
---
> re__copy_and_pad(char *dst, const char *src, size_t width)
911c915
< int i;
---
> size_t i;
934a939,946
> if (el->el_line.cursor >= el->el_line.lastchar) {
> if (el->el_map.current == el->el_map.alt
> && el->el_line.lastchar != el->el_line.buffer)
> el->el_line.cursor = el->el_line.lastchar - 1;
> else
> el->el_line.cursor = el->el_line.lastchar;
> }
>
942c954
< c = (unsigned char)*cp;
---
> c = *cp;
1057,1058c1069,1070
< re_fastputc(el, (int) ((((unsigned int) c >> 6) & 7) + '0'));
< re_fastputc(el, (int) ((((unsigned int) c >> 3) & 7) + '0'));
---
> re_fastputc(el, (int)(((((unsigned int)c) >> 6) & 3) + '0'));
> re_fastputc(el, (int)(((((unsigned int)c) >> 3) & 7) + '0'));