diff options
Diffstat (limited to 'ncurses/trace/lib_tracebits.c')
| -rw-r--r-- | ncurses/trace/lib_tracebits.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/ncurses/trace/lib_tracebits.c b/ncurses/trace/lib_tracebits.c index 4bc50f3b0857..b9f44888896e 100644 --- a/ncurses/trace/lib_tracebits.c +++ b/ncurses/trace/lib_tracebits.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2024,2025 Thomas E. Dickey * * Copyright 1998-2012,2015 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,16 +35,12 @@ #include <curses.priv.h> -MODULE_ID("$Id: lib_tracebits.c,v 1.31 2020/11/14 23:38:11 tom Exp $") +MODULE_ID("$Id: lib_tracebits.c,v 1.37 2025/12/23 09:23:38 tom Exp $") #if HAVE_SYS_TERMIO_H #include <sys/termio.h> /* needed for ISC */ #endif -#ifdef __EMX__ -#include <io.h> -#endif - /* may be undefined if we're using termio.h */ #ifndef TOSTOP #define TOSTOP 0 @@ -72,21 +68,21 @@ MODULE_ID("$Id: lib_tracebits.c,v 1.31 2020/11/14 23:38:11 tom Exp $") #ifdef TRACE -#if defined(EXP_WIN32_DRIVER) +#if defined(USE_WIN32CON_DRIVER) #define BITNAMELEN 36 #else #define BITNAMELEN 8 #endif typedef struct { - unsigned int val; + unsigned long val; const char name[BITNAMELEN]; } BITNAMES; #define TRACE_BUF_SIZE(num) (_nc_globals.tracebuf_ptr[num].size) static void -lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned int val) +lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned long val) { const BITNAMES *sp; @@ -172,7 +168,7 @@ _nc_trace_ttymode(const TTY * tty) 8 + sizeof(cflags) + 8 + sizeof(lflags) + 8); - if (buf != 0) { + if (buf != NULL) { if (tty->c_iflag & ALLIN) lookup_bits(buf, iflags, "iflags", tty->c_iflag); @@ -218,7 +214,7 @@ _nc_trace_ttymode(const TTY * tty) if (tty->c_lflag & ALLLOCAL) lookup_bits(buf, lflags, "lflags", tty->c_lflag); } -#elif defined(EXP_WIN32_DRIVER) +#elif defined(USE_WIN32CON_DRIVER) #define DATA(name) { name, { #name } } static const BITNAMES dwFlagsOut[] = { @@ -244,7 +240,7 @@ _nc_trace_ttymode(const TTY * tty) buf = _nc_trace_buf(0, 8 + sizeof(dwFlagsOut) + 8 + sizeof(dwFlagsIn)); - if (buf != 0) { + if (buf != NULL) { lookup_bits(buf, dwFlagsIn, "dwIn", tty->dwFlagIn); lookup_bits(buf, dwFlagsOut, "dwOut", tty->dwFlagOut); } @@ -284,7 +280,7 @@ _nc_trace_ttymode(const TTY * tty) buf = _nc_trace_buf(0, 8 + sizeof(cflags)); - if (buf != 0) { + if (buf != NULL) { if (tty->sg_flags & ALLCTRL) { lookup_bits(buf, cflags, "cflags", tty->sg_flags); } |