From 7e43628d564974a839a90590c8def55e783d23a2 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Sun, 9 Mar 2008 20:24:33 +0000 Subject: [PATCH] Eliminate type-size errors and warnings; some NO_CHANNEL and NO_PROCESS were long types, while the corresponding Tchannel and Tprocess were int types. Now all are int types. --- v7/src/microcode/ntio.c | 4 ++-- v7/src/microcode/ntproc.c | 4 ++-- v7/src/microcode/os2io.c | 4 ++-- v7/src/microcode/os2proc.c | 4 ++-- v7/src/microcode/osio.h | 6 +++--- v7/src/microcode/osproc.h | 6 +++--- v7/src/microcode/uxio.c | 4 ++-- v7/src/microcode/uxproc.c | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/v7/src/microcode/ntio.c b/v7/src/microcode/ntio.c index 7cd91c4eb..3e038790a 100644 --- a/v7/src/microcode/ntio.c +++ b/v7/src/microcode/ntio.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: ntio.c,v 1.36 2008/01/30 20:02:15 cph Exp $ +$Id: ntio.c,v 1.37 2008/03/09 20:24:24 cph Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -65,7 +65,7 @@ static int test_for_pending_event (void); #define NT_DEFAULT_CHANNEL_TABLE_SIZE 1024 #endif -size_t OS_channel_table_size; +Tchannel OS_channel_table_size; struct channel * NT_channel_table; Tchannel diff --git a/v7/src/microcode/ntproc.c b/v7/src/microcode/ntproc.c index 3176726d5..4417084c9 100644 --- a/v7/src/microcode/ntproc.c +++ b/v7/src/microcode/ntproc.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: ntproc.c,v 1.14 2008/01/30 20:02:15 cph Exp $ +$Id: ntproc.c,v 1.15 2008/03/09 20:24:26 cph Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -58,7 +58,7 @@ typedef struct #ifndef NT_DEFAULT_PROCESS_TABLE_SIZE #define NT_DEFAULT_PROCESS_TABLE_SIZE 4096 #endif -size_t OS_process_table_size; +Tprocess OS_process_table_size; enum process_jc_status scheme_jc_status; static process_t * process_table; diff --git a/v7/src/microcode/os2io.c b/v7/src/microcode/os2io.c index 7c0b052a5..535fbfb1a 100644 --- a/v7/src/microcode/os2io.c +++ b/v7/src/microcode/os2io.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: os2io.c,v 1.14 2008/01/30 20:02:16 cph Exp $ +$Id: os2io.c,v 1.15 2008/03/09 20:24:27 cph Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -35,7 +35,7 @@ extern void OS2_initialize_pipe_channel (Tchannel); static enum channel_type handle_channel_type (LHANDLE); static void handle_noinherit (LHANDLE); -size_t OS_channel_table_size; +Tchannel OS_channel_table_size; struct channel * OS2_channel_table; Tchannel * OS2_channel_pointer_table; const int OS_have_select_p = 1; diff --git a/v7/src/microcode/os2proc.c b/v7/src/microcode/os2proc.c index a4489fa24..130dd78b3 100644 --- a/v7/src/microcode/os2proc.c +++ b/v7/src/microcode/os2proc.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: os2proc.c,v 1.13 2008/01/30 20:02:17 cph Exp $ +$Id: os2proc.c,v 1.14 2008/03/09 20:24:29 cph Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -70,7 +70,7 @@ static void allocate_process_abort (void *); static void child_wait_thread (void *); static Tprocess find_process (PID); -size_t OS_process_table_size; +Tprocess OS_process_table_size; enum process_jc_status scheme_jc_status; static HMTX process_lock; diff --git a/v7/src/microcode/osio.h b/v7/src/microcode/osio.h index a180bb490..d323bd411 100644 --- a/v7/src/microcode/osio.h +++ b/v7/src/microcode/osio.h @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: osio.h,v 1.24 2008/01/30 20:02:17 cph Exp $ +$Id: osio.h,v 1.25 2008/03/09 20:24:30 cph Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -52,8 +52,8 @@ enum channel_type channel_type_win32_named_pipe }; -extern size_t OS_channel_table_size; -#define NO_CHANNEL ((size_t) -1) +extern Tchannel OS_channel_table_size; +#define NO_CHANNEL ((Tchannel) -1) extern int OS_channel_open_p (Tchannel channel); extern void OS_channel_close (Tchannel channel); extern void OS_channel_close_noerror (Tchannel channel); diff --git a/v7/src/microcode/osproc.h b/v7/src/microcode/osproc.h index 8af84d743..a82c7cbdb 100644 --- a/v7/src/microcode/osproc.h +++ b/v7/src/microcode/osproc.h @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: osproc.h,v 1.17 2008/01/30 20:02:17 cph Exp $ +$Id: osproc.h,v 1.18 2008/03/09 20:24:31 cph Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -74,8 +74,8 @@ enum process_channel_type process_channel_type_explicit }; -extern size_t OS_process_table_size; -#define NO_PROCESS ((size_t) -1) +extern Tprocess OS_process_table_size; +#define NO_PROCESS ((Tprocess) -1) extern enum process_jc_status scheme_jc_status; /* OS_make_subprocess is obsolete; use OS-specific procedure. */ diff --git a/v7/src/microcode/uxio.c b/v7/src/microcode/uxio.c index 067ab4c63..48006b451 100644 --- a/v7/src/microcode/uxio.c +++ b/v7/src/microcode/uxio.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: uxio.c,v 1.59 2008/01/30 20:02:22 cph Exp $ +$Id: uxio.c,v 1.60 2008/03/09 20:24:32 cph Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -32,7 +32,7 @@ USA. #include "uxselect.h" #include "uxproc.h" -size_t OS_channel_table_size; +Tchannel OS_channel_table_size; struct channel * channel_table; #ifndef HAVE_POLL diff --git a/v7/src/microcode/uxproc.c b/v7/src/microcode/uxproc.c index c0de6ceaf..e580089b3 100644 --- a/v7/src/microcode/uxproc.c +++ b/v7/src/microcode/uxproc.c @@ -1,6 +1,6 @@ /* -*-C-*- -$Id: uxproc.c,v 1.37 2008/01/30 20:02:22 cph Exp $ +$Id: uxproc.c,v 1.38 2008/03/09 20:24:33 cph Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -49,7 +49,7 @@ static void get_terminal_back (void); static void process_wait (Tprocess process); static int child_setup_tty (int fd); -size_t OS_process_table_size; +Tprocess OS_process_table_size; struct process * process_table; enum process_jc_status scheme_jc_status; -- 2.25.1