From 43809d070b127a0b7c331c3829a92a36e9fbb1f5 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Fri, 23 Dec 2022 18:50:35 -0800 Subject: [PATCH] Fix a few sign-conversion and shorten-64-to-32 warnings while converting some values from int to unsigned --- inc/ifpage.h | 8 ++++---- inc/initsoutdefs.h | 2 +- inc/ldsoutdefs.h | 2 +- src/initsout.c | 4 ++-- src/ldsout.c | 7 +++---- src/main.c | 4 ++-- src/xrdopt.c | 5 +++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/inc/ifpage.h b/inc/ifpage.h index 6aaa5f8..e4b00cc 100755 --- a/inc/ifpage.h +++ b/inc/ifpage.h @@ -91,10 +91,10 @@ typedef struct ifpage { LispPTR dlnilp1; LispPTR dlnilp2; LispPTR dlnilp3; - int dllastvmempage; + unsigned dllastvmempage; int nactivepages; int ndirtypages; - int process_size; /* was lastnumchars */ + unsigned process_size; /* was lastnumchars */ } IFPAGE; #else /* Normal definition, for big-endian machines */ @@ -248,10 +248,10 @@ typedef struct ifpage { LispPTR dlnilp1; LispPTR dlnilp2; LispPTR dlnilp3; - int dllastvmempage; + unsigned dllastvmempage; int nactivepages; int ndirtypages; - int process_size; /* was lastnumchars */ + unsigned process_size; /* was lastnumchars */ } IFPAGE; #else /***********************************************************/ diff --git a/inc/initsoutdefs.h b/inc/initsoutdefs.h index 647204a..fb85b65 100644 --- a/inc/initsoutdefs.h +++ b/inc/initsoutdefs.h @@ -2,7 +2,7 @@ #define INITSOUTDEFS_H 1 #include "lispemul.h" /* for LispPTR */ LispPTR *fixp_value(LispPTR *ptr); -void init_ifpage(int sysout_size); +void init_ifpage(unsigned sysout_size); void init_iopage(void); void build_lisp_map(void); void init_for_keyhandle(void); diff --git a/inc/ldsoutdefs.h b/inc/ldsoutdefs.h index 805146b..f9d14eb 100644 --- a/inc/ldsoutdefs.h +++ b/inc/ldsoutdefs.h @@ -1,4 +1,4 @@ #ifndef LDSOUTDEFS_H #define LDSOUTDEFS_H 1 -int sysout_loader(const char * sysout_file_name, int sys_size); +unsigned sysout_loader(const char * sysout_file_name, unsigned sys_size); #endif diff --git a/src/initsout.c b/src/initsout.c index cfc8474..1f6151c 100644 --- a/src/initsout.c +++ b/src/initsout.c @@ -108,11 +108,11 @@ LispPTR *fixp_value(LispPTR *ptr) { #define PAGES_IN_MBYTE 2048 -void init_ifpage(int sysout_size) { +void init_ifpage(unsigned sysout_size) { extern const time_t MDate; extern int DisplayType; extern int Storage_expanded; - int new_lastvmem; + unsigned new_lastvmem; /* Initialize IFPAGE */ diff --git a/src/ldsout.c b/src/ldsout.c index 95e1d74..15726b1 100644 --- a/src/ldsout.c +++ b/src/ldsout.c @@ -54,7 +54,7 @@ extern DspInterface currentdsp; #endif /* DOS || XWINDOW */ /* sys_size is sysout size in megabytes */ -int sysout_loader(const char *sysout_file_name, int sys_size) { +unsigned sysout_loader(const char *sysout_file_name, unsigned sys_size) { int sysout; /* SysoutFile descriptor */ IFPAGE ifpage; /* IFPAGE */ @@ -72,7 +72,6 @@ int sysout_loader(const char *sysout_file_name, int sys_size) { unsigned sysout_size; /* sysout size in page */ struct stat stat_buf; /* file stat buf */ - int i; char errmsg[255]; @@ -199,7 +198,7 @@ int sysout_loader(const char *sysout_file_name, int sys_size) { perror("sysout_loader: can't get sysout file size"); exit(-1); } - sysout_size = stat_buf.st_size / BYTESPER_PAGE * 2; + sysout_size = (unsigned)(stat_buf.st_size / BYTESPER_PAGE * 2); DBPRINT(("sysout size / 2 = 0x%x\n", sysout_size / 2)); DBPRINT(("vmem size = 0x%x\n", ifpage.nactivepages)); @@ -274,7 +273,7 @@ int sysout_loader(const char *sysout_file_name, int sys_size) { /* read sysout file to lispworld */ - for (i = 0; i < (sysout_size / 2); i++) { + for (unsigned i = 0; i < (sysout_size / 2); i++) { #ifdef DOS /* Dial that floats from left to right on the top line of the */ /* displaty. Dial shows % of sysout loaded by digits and */ diff --git a/src/main.c b/src/main.c index e84a177..925aa22 100644 --- a/src/main.c +++ b/src/main.c @@ -230,7 +230,7 @@ int display_max = 65536 * 16 * 2; extern int maxpages; char sysout_name[MAXPATHLEN]; /* Set by read_Xoption, in the X version. */ -int sysout_size = 0; /* ditto */ +unsigned sysout_size = 0; /* ditto */ int flushing = FALSE; /* see dbprint.h if set, all debug/trace printing will call fflush(stdout) after each printf */ @@ -400,7 +400,7 @@ int main(int argc, char *argv[]) errno = 0; tmpint = strtol(argv[i], (char **)NULL, 10); if (errno == 0 && tmpint > 0) { - sysout_size = tmpint; + sysout_size = (unsigned)tmpint; } else { fprintf(stderr, "Bad value for -m (integer > 0)\n"); exit(1); diff --git a/src/xrdopt.c b/src/xrdopt.c index c0fa657..5ba8af9 100644 --- a/src/xrdopt.c +++ b/src/xrdopt.c @@ -87,7 +87,8 @@ extern char Icon_Title[255]; char Icon_Title[255]; extern char sysout_name[]; -extern int sysout_size, for_makeinit, please_fork, noscroll; +extern unsigned sysout_size; +extern int for_makeinit, please_fork, noscroll; /* diagnostic flag for sysout dumping */ /* extern int maxpages; */ @@ -304,7 +305,7 @@ void read_Xoption(int *argc, char *argv[]) errno = 0; i = (int)strtol(tmp, (char **)NULL, 10); if (errno == 0 && i > 0) - sysout_size = i; + sysout_size = (unsigned)i; } if (XrmGetResource(rDB, "ldex.Init", "Ldex.Init", str_type, &value) == True) { for_makeinit = 1; }