From deaeee4c187c8685dfb87d6b67a256ff32c30733 Mon Sep 17 00:00:00 2001 From: Gaius Mulley Date: Thu, 24 Nov 2022 17:02:48 +0000 Subject: [PATCH] PR-107611 Use correct parameter type in termios (doUnset). 2022-11-24 Rainer Orth gcc/m2/ChangeLog: * gm2-libs-ch/termios.c (doUnset): Use correct parameter tcflag_t *. * mc-boot-ch/Gtermios.cc (doUnset): Use correct parameter tcflag_t *. * pge-boot/Gtermios.cc (doUnset): Use correct parameter tcflag_t *. libgm2/ChangeLog: * libm2pim/termios.cc (doUnset): Use correct parameter tcflag_t *. Signed-off-by: Gaius Mulley --- gcc/m2/gm2-libs-ch/termios.c | 4 ++-- gcc/m2/mc-boot-ch/Gtermios.cc | 2 +- gcc/m2/pge-boot/Gtermios.cc | 2 +- libgm2/libm2pim/termios.cc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/m2/gm2-libs-ch/termios.c b/gcc/m2/gm2-libs-ch/termios.c index 73d9e11a9b41..7075d25bb98b 100644 --- a/gcc/m2/gm2-libs-ch/termios.c +++ b/gcc/m2/gm2-libs-ch/termios.c @@ -195,7 +195,7 @@ int EXPORT (SetChar) (struct termios *t, ControlChar c, char ch); int EXPORT (tcsnow) (void); int EXPORT (tcsflush) (void); int EXPORT (tcsdrain) (void); -int doSetUnset (unsigned int *bitset, unsigned int mask, int value); +int doSetUnset (tcflag_t *bitset, unsigned int mask, int value); void _M2_termios_init (void); void _M2_termios_finish (void); @@ -376,7 +376,7 @@ int EXPORT (tcflowoffo) (int fd) /* doSetUnset - applies mask or undoes mask depending upon value. */ int -doSetUnset (unsigned int *bitset, unsigned int mask, int value) +doSetUnset (tcflag_t *bitset, unsigned int mask, int value) { if (value) (*bitset) |= mask; diff --git a/gcc/m2/mc-boot-ch/Gtermios.cc b/gcc/m2/mc-boot-ch/Gtermios.cc index 5982b5f9ea23..79c22005804e 100644 --- a/gcc/m2/mc-boot-ch/Gtermios.cc +++ b/gcc/m2/mc-boot-ch/Gtermios.cc @@ -165,7 +165,7 @@ typedef enum { } Flag; int -doSetUnset (unsigned int *bitset, unsigned int mask, int value) +doSetUnset (tcflag_t *bitset, unsigned int mask, int value) { if (value) (*bitset) |= mask; diff --git a/gcc/m2/pge-boot/Gtermios.cc b/gcc/m2/pge-boot/Gtermios.cc index 5982b5f9ea23..79c22005804e 100644 --- a/gcc/m2/pge-boot/Gtermios.cc +++ b/gcc/m2/pge-boot/Gtermios.cc @@ -165,7 +165,7 @@ typedef enum { } Flag; int -doSetUnset (unsigned int *bitset, unsigned int mask, int value) +doSetUnset (tcflag_t *bitset, unsigned int mask, int value) { if (value) (*bitset) |= mask; diff --git a/libgm2/libm2pim/termios.cc b/libgm2/libm2pim/termios.cc index 3015ee1380de..b446bb80cf32 100644 --- a/libgm2/libm2pim/termios.cc +++ b/libgm2/libm2pim/termios.cc @@ -213,7 +213,7 @@ extern "C" int EXPORT (SetChar) (struct termios *t, ControlChar c, char ch); extern "C" int EXPORT (tcsnow) (void); extern "C" int EXPORT (tcsflush) (void); extern "C" int EXPORT (tcsdrain) (void); -extern "C" int doSetUnset (unsigned int *bitset, unsigned int mask, int value); +extern "C" int doSetUnset (tcflag_t *bitset, unsigned int mask, int value); /* InitTermios new data structure. */ @@ -413,7 +413,7 @@ EXPORT (tcflowoffo) (int fd) /* doSetUnset applies mask or undoes mask depending upon value. */ extern "C" int -doSetUnset (unsigned int *bitset, unsigned int mask, int value) +doSetUnset (tcflag_t *bitset, unsigned int mask, int value) { if (value) (*bitset) |= mask; -- 2.47.2