From 14402131e73717f8113aff33dd38af81b2120533 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 28 Dec 2020 15:19:26 +0700 Subject: [PATCH] Reduce number of `-Wshorten-64-to-32` warnings. (#138) --- src/dir.c | 12 ++++++++---- src/dsk.c | 3 ++- src/initsout.c | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/dir.c b/src/dir.c index 4a52c93..349e8ed 100644 --- a/src/dir.c +++ b/src/dir.c @@ -613,7 +613,8 @@ static int enum_dsk_prop(char *dir, char *name, char *ver, FINFO **finfo_buf) register struct dirent *dp; register FINFO *prevp; register FINFO *nextp; - int n, len, rval; + int n, rval; + size_t len; DIR *dirp; register struct passwd *pwd; struct stat sbuf; @@ -876,7 +877,8 @@ static int enum_dsk(char *dir, char *name, char *ver, FINFO **finfo_buf) register struct dirent *dp; register FINFO *prevp; register FINFO *nextp; - int n, len, rval; + int n, rval; + size_t len; DIR *dirp; struct stat sbuf; char namebuf[MAXPATHLEN]; @@ -1070,7 +1072,8 @@ static int enum_ufs_prop(char *dir, char *name, char *ver, FINFO **finfo_buf) register struct dirent *dp; register FINFO *prevp; register FINFO *nextp; - int n, len, rval; + int n, rval; + size_t len; DIR *dirp; register struct passwd *pwd; struct stat sbuf; @@ -1253,7 +1256,8 @@ static int enum_ufs(char *dir, char *name, char *ver, FINFO **finfo_buf) register struct dirent *dp; register FINFO *prevp; register FINFO *nextp; - int n, len, rval; + int n, rval; + size_t len; DIR *dirp; struct stat sbuf; char namebuf[MAXPATHLEN]; diff --git a/src/dsk.c b/src/dsk.c index bbb9937..ee24908 100644 --- a/src/dsk.c +++ b/src/dsk.c @@ -2606,7 +2606,8 @@ static int locate_file(char *dir, char *name) char path[MAXPATHLEN]; char nb1[MAXNAMLEN], nb2[MAXNAMLEN]; - register int type, len; + register int type; + size_t len; DIR *dirp; struct dirent *dp; diff --git a/src/initsout.c b/src/initsout.c index fc3a1dd..8830bba 100644 --- a/src/initsout.c +++ b/src/initsout.c @@ -165,7 +165,7 @@ are null terminated instead */ if ((pwd = getpwuid(getuid())) != NULL) { InterfacePage->usernameaddr = 0155001; s = (char *)Addr68k_from_LADDR(InterfacePage->usernameaddr); - len = strlen(pwd->pw_name); + len = (int)strlen(pwd->pw_name); /* Lisp reserves 32 words for the BCPL String */ len = (len < 32 * BYTESPER_DLWORD) ? len : 32 * BYTESPER_DLWORD - 1; *s = (char)len;