diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-04-05 15:05:52 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-04-05 15:05:52 -0700 |
| commit | cd900e40b5676874d076c35466fd7baa6a49b1f6 (patch) | |
| tree | c04168c7db0fcb3e401f09ce4d30a13dd65e7712 /src/process.c | |
| parent | 27f9a9324d58c9a7472c724c62f5b7ea0e1f4681 (diff) | |
Replace many malloc(strlen()); strcpy() pairs with strdup()
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/process.c b/src/process.c index 2a97dcb..416f1c6 100644 --- a/src/process.c +++ b/src/process.c @@ -615,7 +615,7 @@ IceReplyWaitInfo *replyWait; _IceConnectionError *errorReply = &(((_IceReply *) (replyWait->reply))->connection_error); char *errorStr = NULL; - char *tempstr; + const char *tempstr; char *prefix, *temp; invokeHandler = 0; @@ -627,16 +627,14 @@ IceReplyWaitInfo *replyWait; tempstr = "None of the ICE versions specified are supported"; - errorStr = (char *) malloc (strlen (tempstr) + 1); - strcpy (errorStr, tempstr); + errorStr = strdup(tempstr); break; case IceNoAuth: tempstr = "None of the authentication protocols specified are supported"; - errorStr = (char *) malloc (strlen (tempstr) + 1); - strcpy (errorStr, tempstr); + errorStr = strdup(tempstr); break; case IceSetupFailed: @@ -697,16 +695,14 @@ IceReplyWaitInfo *replyWait; temp = "None of the protocol versions specified are supported"; - errorStr = (char *) malloc (strlen (temp) + 1); - strcpy (errorStr, temp); + errorStr = strdup(temp); break; case IceNoAuth: temp = "None of the authentication protocols specified are supported"; - errorStr = (char *) malloc (strlen (temp) + 1); - strcpy (errorStr, temp); + errorStr = strdup(temp); break; case IceSetupFailed: @@ -1129,11 +1125,11 @@ IceReplyWaitInfo *replyWait; _IceConnectionError *errorReply = &(((_IceReply *) (replyWait->reply))->connection_error); - char *tempstr = "Received bad authIndex in the AuthRequired message"; + const char *tempstr + = "Received bad authIndex in the AuthRequired message"; char errIndex = (int) message->authIndex; - errorString = (char *) malloc (strlen (tempstr) + 1); - strcpy (errorString, tempstr); + errorString = strdup(tempstr); errorReply->type = ICE_CONNECTION_ERROR; errorReply->error_message = errorString; @@ -1159,11 +1155,11 @@ IceReplyWaitInfo *replyWait; _IceProtocolError *errorReply = &(((_IceReply *) (replyWait->reply))->protocol_error); - char *tempstr = "Received bad authIndex in the AuthRequired message"; + const char *tempstr + = "Received bad authIndex in the AuthRequired message"; char errIndex = (int) message->authIndex; - errorString = (char *) malloc (strlen (tempstr) + 1); - strcpy (errorString, tempstr); + errorString = strdup(tempstr); errorReply->type = ICE_PROTOCOL_ERROR; errorReply->error_message = errorString; |