Skip to content

Commit 1440213

Browse files
Reduce number of -Wshorten-64-to-32 warnings. (#138)
1 parent 999851e commit 1440213

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

src/dir.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,8 @@ static int enum_dsk_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
613613
register struct dirent *dp;
614614
register FINFO *prevp;
615615
register FINFO *nextp;
616-
int n, len, rval;
616+
int n, rval;
617+
size_t len;
617618
DIR *dirp;
618619
register struct passwd *pwd;
619620
struct stat sbuf;
@@ -876,7 +877,8 @@ static int enum_dsk(char *dir, char *name, char *ver, FINFO **finfo_buf)
876877
register struct dirent *dp;
877878
register FINFO *prevp;
878879
register FINFO *nextp;
879-
int n, len, rval;
880+
int n, rval;
881+
size_t len;
880882
DIR *dirp;
881883
struct stat sbuf;
882884
char namebuf[MAXPATHLEN];
@@ -1070,7 +1072,8 @@ static int enum_ufs_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
10701072
register struct dirent *dp;
10711073
register FINFO *prevp;
10721074
register FINFO *nextp;
1073-
int n, len, rval;
1075+
int n, rval;
1076+
size_t len;
10741077
DIR *dirp;
10751078
register struct passwd *pwd;
10761079
struct stat sbuf;
@@ -1253,7 +1256,8 @@ static int enum_ufs(char *dir, char *name, char *ver, FINFO **finfo_buf)
12531256
register struct dirent *dp;
12541257
register FINFO *prevp;
12551258
register FINFO *nextp;
1256-
int n, len, rval;
1259+
int n, rval;
1260+
size_t len;
12571261
DIR *dirp;
12581262
struct stat sbuf;
12591263
char namebuf[MAXPATHLEN];

src/dsk.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2606,7 +2606,8 @@ static int locate_file(char *dir, char *name)
26062606

26072607
char path[MAXPATHLEN];
26082608
char nb1[MAXNAMLEN], nb2[MAXNAMLEN];
2609-
register int type, len;
2609+
register int type;
2610+
size_t len;
26102611
DIR *dirp;
26112612
struct dirent *dp;
26122613

src/initsout.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ are null terminated instead */
165165
if ((pwd = getpwuid(getuid())) != NULL) {
166166
InterfacePage->usernameaddr = 0155001;
167167
s = (char *)Addr68k_from_LADDR(InterfacePage->usernameaddr);
168-
len = strlen(pwd->pw_name);
168+
len = (int)strlen(pwd->pw_name);
169169
/* Lisp reserves 32 words for the BCPL String */
170170
len = (len < 32 * BYTESPER_DLWORD) ? len : 32 * BYTESPER_DLWORD - 1;
171171
*s = (char)len;

0 commit comments

Comments
 (0)