Skip to content

Reduce number of -Wshorten-64-to-32 warnings. #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 28, 2020
Merged

Reduce number of -Wshorten-64-to-32 warnings. #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/dir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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];
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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];
Expand Down
3 changes: 2 additions & 1 deletion src/dsk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/initsout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down