Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

curses: constify newterm() and setterm() arguments 

newterm() argument is const in the spec, so this fixes our
conformance.

setterm() is not in the spec, but it's natural and in ncurses its
argument is const too, so follow suit.

Doesn't change the ABI, so no bump required.

ok blymn@
This commit is contained in:
uwe 2024-05-17 23:32:50 +00:00
parent a7aa342f5e
commit a9c500b2e8
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libcurses/curses.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: curses.h,v 1.131 2024/05/14 10:22:48 uwe Exp $ */
/* $NetBSD: curses.h,v 1.132 2024/05/17 23:32:50 uwe Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@ -719,7 +719,7 @@ int mvwprintw(WINDOW *, int, int, const char *, ...) __printflike(4, 5);
int mvwscanw(WINDOW *, int, int, const char *, ...) __scanflike(4, 5);
int napms(int);
WINDOW *newpad(int, int);
SCREEN *newterm(char *, FILE *, FILE *);
SCREEN *newterm(const char *, FILE *, FILE *);
WINDOW *newwin(int, int, int, int);
int nl(void);
attr_t no_color_attributes(void);
@ -751,7 +751,7 @@ int savetty(void);
int scanw(const char *, ...) __scanflike(1, 2);
int scroll(WINDOW *);
int scrollok(WINDOW *, bool);
int setterm(char *);
int setterm(const char *);
int set_escdelay(int);
int set_tabsize(int);
SCREEN *set_term(SCREEN *);

4
lib/libcurses/curses_private.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: curses_private.h,v 1.80 2022/05/03 07:25:34 blymn Exp $ */
/* $NetBSD: curses_private.h,v 1.81 2024/05/17 23:32:50 uwe Exp $ */
/*-
* Copyright (c) 1998-2000 Brett Lymn
@ -355,7 +355,7 @@ int _cursesi_waddbytes(WINDOW *, const char *, int, attr_t, int);
void _cursesi_reset_wacs(SCREEN *);
#endif /* HAVE_WCHAR */
void _cursesi_resetterm(SCREEN *);
int _cursesi_setterm(char *, SCREEN *);
int _cursesi_setterm(const char *, SCREEN *);
int __delay(void);
unsigned int __hash_more(const void *, size_t, unsigned int);
unsigned int __hash_line(const __LDATA *, int);

12
lib/libcurses/curses_screen.3
View File

@ -1,4 +1,4 @@
.\" $NetBSD: curses_screen.3,v 1.28 2021/02/07 23:00:57 rillig Exp $
.\" $NetBSD: curses_screen.3,v 1.29 2024/05/17 23:32:50 uwe Exp $
.\"
.\" Copyright (c) 2002
.\" Brett Lymn (blymn@NetBSD.org, brett_lymn@yahoo.com.au)
@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\"
.Dd March 12, 2020
.Dd May 16, 2024
.Dt CURSES_SCREEN 3
.Os
.Sh NAME
@ -61,7 +61,7 @@
.Ft void
.Fn use_env "bool value"
.Ft SCREEN *
.Fn newterm "char *type" "FILE *outfd" "FILE *infd"
.Fn newterm "const char *type" "FILE *outfd" "FILE *infd"
.Ft SCREEN *
.Fn set_term "SCREEN *screen"
.Ft void
@ -79,7 +79,7 @@
.Ft int
.Fn resizeterm "int lines" "int cols"
.Ft int
.Fn setterm "char *name"
.Fn setterm "const char *name"
.Ft int
.Fn set_tabsize "int value"
.Pp
@ -99,7 +99,9 @@ argument points to a
.Xr terminfo 5
entry, or it may be
.Dv NULL
in which case the TERM environment variable is used.
in which case the
.Ev TERM
environment variable is used.
The
.Fa outfd
and

10
lib/libcurses/screen.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: screen.c,v 1.37 2022/04/08 10:17:52 andvar Exp $ */
/* $NetBSD: screen.c,v 1.38 2024/05/17 23:32:50 uwe Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)screen.c 8.2 (blymn) 11/27/2001";
#else
__RCSID("$NetBSD: screen.c,v 1.37 2022/04/08 10:17:52 andvar Exp $");
__RCSID("$NetBSD: screen.c,v 1.38 2024/05/17 23:32:50 uwe Exp $");
#endif
#endif /* not lint */
@ -124,10 +124,10 @@ set_term(SCREEN *new)
*
*/
SCREEN *
newterm(char *type, FILE *outfd, FILE *infd)
newterm(const char *type, FILE *outfd, FILE *infd)
{
SCREEN *new_screen;
char *sp;
const char *sp;
sp = type;
if (type == NULL && (sp = getenv("TERM")) == NULL)
@ -176,7 +176,7 @@ newterm(char *type, FILE *outfd, FILE *infd)
if (_cursesi_gettmode(new_screen) == ERR)
goto error_exit;
if (_cursesi_setterm((char *)sp, new_screen) == ERR)
if (_cursesi_setterm(sp, new_screen) == ERR)
goto error_exit;
/* Need either homing or cursor motion for refreshes */

8
lib/libcurses/setterm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: setterm.c,v 1.71 2021/09/06 07:45:48 rin Exp $ */
/* $NetBSD: setterm.c,v 1.72 2024/05/17 23:32:50 uwe Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)setterm.c 8.8 (Berkeley) 10/25/94";
#else
__RCSID("$NetBSD: setterm.c,v 1.71 2021/09/06 07:45:48 rin Exp $");
__RCSID("$NetBSD: setterm.c,v 1.72 2024/05/17 23:32:50 uwe Exp $");
#endif
#endif /* not lint */
@ -52,14 +52,14 @@ static int does_ctrl_o(const char *exit_cap, const char *acs_cap);
attr_t __mask_op, __mask_me, __mask_ue, __mask_se;
int
setterm(char *type)
setterm(const char *type)
{
return _cursesi_setterm(type, _cursesi_screen);
}
int
_cursesi_setterm(char *type, SCREEN *screen)
_cursesi_setterm(const char *type, SCREEN *screen)
{
int unknown, r;
char *p;