walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added a bunch of explicit casts when using malloc().

This commit is contained in:
Ryan C. Gordon 2002-05-27 19:10:45 +00:00
parent 78e64771d7
commit 5be59c1592
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/posix.c
View File

@ -54,7 +54,7 @@ char *__PHYSFS_platformCopyEnvironmentVariable(const char *varname)
if (envr != NULL) if (envr != NULL)
{ {
retval = malloc(strlen(envr) + 1); retval = (char *) malloc(strlen(envr) + 1);
if (retval != NULL) if (retval != NULL)
strcpy(retval, envr); strcpy(retval, envr);
} /* if */ } /* if */
@ -72,7 +72,7 @@ static char *getUserNameByUID(void)
pw = getpwuid(uid); pw = getpwuid(uid);
if ((pw != NULL) && (pw->pw_name != NULL)) if ((pw != NULL) && (pw->pw_name != NULL))
{ {
retval = malloc(strlen(pw->pw_name) + 1); retval = (char *) malloc(strlen(pw->pw_name) + 1);
if (retval != NULL) if (retval != NULL)
strcpy(retval, pw->pw_name); strcpy(retval, pw->pw_name);
} /* if */ } /* if */
@ -90,7 +90,7 @@ static char *getUserDirByUID(void)
pw = getpwuid(uid); pw = getpwuid(uid);
if ((pw != NULL) && (pw->pw_dir != NULL)) if ((pw != NULL) && (pw->pw_dir != NULL))
{ {
retval = malloc(strlen(pw->pw_dir) + 1); retval = (char *) malloc(strlen(pw->pw_dir) + 1);
if (retval != NULL) if (retval != NULL)
strcpy(retval, pw->pw_dir); strcpy(retval, pw->pw_dir);
} /* if */ } /* if */
@ -188,7 +188,7 @@ char *__PHYSFS_platformCvtToDependent(const char *prepend,
int len = ((prepend) ? strlen(prepend) : 0) + int len = ((prepend) ? strlen(prepend) : 0) +
((append) ? strlen(append) : 0) + ((append) ? strlen(append) : 0) +
strlen(dirName) + 1; strlen(dirName) + 1;
char *retval = malloc(len); char *retval = (char *) malloc(len);
BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL);
@ -225,7 +225,7 @@ LinkedStringList *__PHYSFS_platformEnumerateFiles(const char *dirname,
{ {
dlen = strlen(dirname); dlen = strlen(dirname);
bufsize = dlen + 256; bufsize = dlen + 256;
buf = malloc(bufsize); buf = (char *) malloc(bufsize);
BAIL_IF_MACRO(buf == NULL, ERR_OUT_OF_MEMORY, NULL); BAIL_IF_MACRO(buf == NULL, ERR_OUT_OF_MEMORY, NULL);
strcpy(buf, dirname); strcpy(buf, dirname);
if (buf[dlen - 1] != '/') if (buf[dlen - 1] != '/')