romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-25 06:48:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

remove unnecessary typecasting of malloc()

Browse source
This commit is contained in:
Yang Tse 2008-09-06 05:29:05 +00:00
parent a622fd90b4
commit 59e378f48f
31 changed files with 68 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/ssh.c
View file

@ -379,7 +379,7 @@ static CURLcode ssh_getworkingpath(struct connectdata *conn,
/* Check for /~/ , indicating relative to the user's home directory */
if(conn->protocol & PROT_SCP) {
real_path = (char *)malloc(working_path_len+1);
real_path = malloc(working_path_len+1);
if(real_path == NULL) {
free(working_path);
return CURLE_OUT_OF_MEMORY;
@ -393,7 +393,7 @@ static CURLcode ssh_getworkingpath(struct connectdata *conn,
else if(conn->protocol & PROT_SFTP) {
if((working_path_len > 1) && (working_path[1] == '~')) {
size_t homelen = strlen(homedir);
real_path = (char *)malloc(homelen + working_path_len + 1);
real_path = malloc(homelen + working_path_len + 1);
if(real_path == NULL) {
free(working_path);
return CURLE_OUT_OF_MEMORY;
@ -409,7 +409,7 @@ static CURLcode ssh_getworkingpath(struct connectdata *conn,
}
}
else {
real_path = (char *)malloc(working_path_len+1);
real_path = malloc(working_path_len+1);
if(real_path == NULL) {
free(working_path);
return CURLE_OUT_OF_MEMORY;
@ -1403,12 +1403,12 @@ static CURLcode ssh_statemach_act(struct connectdata *conn)
break;
}
}
if((sshc->readdir_filename = (char *)malloc(PATH_MAX+1)) == NULL) {
if((sshc->readdir_filename = malloc(PATH_MAX+1)) == NULL) {
state(conn, SSH_SFTP_CLOSE);
sshc->actualcode = CURLE_OUT_OF_MEMORY;
break;
}
if((sshc->readdir_longentry = (char *)malloc(PATH_MAX+1)) == NULL) {
if((sshc->readdir_longentry = malloc(PATH_MAX+1)) == NULL) {
Curl_safefree(sshc->readdir_filename);
sshc->readdir_filename = NULL;
state(conn, SSH_SFTP_CLOSE);
@ -1477,7 +1477,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn)
if((sshc->readdir_attrs.flags & LIBSSH2_SFTP_ATTR_PERMISSIONS) &&
((sshc->readdir_attrs.permissions & LIBSSH2_SFTP_S_IFMT) ==
LIBSSH2_SFTP_S_IFLNK)) {
sshc->readdir_linkPath = (char *)malloc(PATH_MAX + 1);
sshc->readdir_linkPath = malloc(PATH_MAX + 1);
if(sshc->readdir_linkPath == NULL) {
Curl_safefree(sshc->readdir_filename);
sshc->readdir_filename = NULL;