From 4033226105fa861ab5f0276850afc24c0fa45406 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 8 Aug 2013 22:17:27 -0700 Subject: Get rid of casts to (char *) in calls to free() Signed-off-by: Alan Coopersmith --- include/X11/ICE/ICEmsg.h | 2 +- src/accept.c | 6 +++--- src/authutil.c | 2 +- src/connect.c | 4 ++-- src/listen.c | 14 +++++++------- src/listenwk.c | 10 +++++----- src/misc.c | 4 ++-- src/process.c | 26 +++++++++++++------------- src/protosetup.c | 4 ++-- src/replywait.c | 2 +- src/shutdown.c | 12 ++++++------ src/watch.c | 6 +++--- 12 files changed, 46 insertions(+), 46 deletions(-) diff --git a/include/X11/ICE/ICEmsg.h b/include/X11/ICE/ICEmsg.h index 800f10b..d959264 100644 --- a/include/X11/ICE/ICEmsg.h +++ b/include/X11/ICE/ICEmsg.h @@ -255,7 +255,7 @@ extern IcePaAuthStatus _IcePaMagicCookie1Proc ( #define IceDisposeCompleteMessage(_iceConn, _pData) \ if ((char *) _pData < _iceConn->inbuf || \ (char *) _pData >= _iceConn->inbufmax) \ - free ((char *) _pData); + free (_pData); #define IceReadSimpleMessage(_iceConn, _msgType, _pMsg) \ diff --git a/src/accept.c b/src/accept.c index 6bc40ad..61bbd7f 100644 --- a/src/accept.c +++ b/src/accept.c @@ -95,7 +95,7 @@ IceAcceptConnection ( if (iceConn->connection_string == NULL) { _IceTransClose (newconn); - free ((char *) iceConn); + free (iceConn); *statusRet = IceAcceptBadMalloc; return (NULL); } @@ -111,7 +111,7 @@ IceAcceptConnection ( else { _IceTransClose (newconn); - free ((char *) iceConn); + free (iceConn); *statusRet = IceAcceptBadMalloc; return (NULL); } @@ -125,7 +125,7 @@ IceAcceptConnection ( { _IceTransClose (newconn); free (iceConn->inbuf); - free ((char *) iceConn); + free (iceConn); *statusRet = IceAcceptBadMalloc; return (NULL); } diff --git a/src/authutil.c b/src/authutil.c index 908d4b1..2a98f19 100644 --- a/src/authutil.c +++ b/src/authutil.c @@ -287,7 +287,7 @@ IceFreeAuthFileEntry ( if (auth->network_id) free (auth->network_id); if (auth->auth_name) free (auth->auth_name); if (auth->auth_data) free (auth->auth_data); - free ((char *) auth); + free (auth); } } diff --git a/src/connect.c b/src/connect.c index 193a746..c25b21f 100644 --- a/src/connect.c +++ b/src/connect.c @@ -158,7 +158,7 @@ IceOpenConnection ( if ((iceConn->trans_conn = ConnectToPeer (networkIdsList, &iceConn->connection_string)) == NULL) { - free ((char *) iceConn); + free (iceConn); strncpy (errorStringRet, "Could not open network socket", errorLength); return (NULL); } @@ -392,7 +392,7 @@ IceOpenConnection ( iceConn->connection_string; _IceConnectionCount++; - free ((char *) iceConn->connect_to_you); + free (iceConn->connect_to_you); iceConn->connect_to_you = NULL; iceConn->connection_status = IceConnectAccepted; diff --git a/src/listen.c b/src/listen.c index 0348fec..0bf1a80 100644 --- a/src/listen.c +++ b/src/listen.c @@ -67,7 +67,7 @@ IceListenForConnections ( { for (i = 0; i < transCount; i++) _IceTransClose (transConns[i]); - free ((char *) transConns); + free (transConns); return (0); } @@ -120,9 +120,9 @@ IceListenForConnections ( strncpy (errorStringRet, "Malloc failed", errorLength); for (j = 0; j < i; j++) - free ((char *) (*listenObjsRet)[j]); + free ((*listenObjsRet)[j]); - free ((char *) *listenObjsRet); + free (*listenObjsRet); *listenObjsRet = NULL; status = 0; @@ -152,8 +152,8 @@ IceListenForConnections ( _IceTransClose (transConns[i]); } - free ((char *) listenObjs); - free ((char *) transConns); + free (listenObjs); + free (transConns); return (status); } @@ -249,10 +249,10 @@ IceFreeListenObjs ( { free (listenObjs[i]->network_id); _IceTransClose (listenObjs[i]->trans_conn); - free ((char *) listenObjs[i]); + free (listenObjs[i]); } - free ((char *) listenObjs); + free (listenObjs); } diff --git a/src/listenwk.c b/src/listenwk.c index 06b56a3..cb80faf 100644 --- a/src/listenwk.c +++ b/src/listenwk.c @@ -69,7 +69,7 @@ IceListenForWellKnownConnections ( { for (i = 0; i < transCount; i++) _IceTransClose (transConns[i]); - free ((char *) transConns); + free (transConns); return (0); } @@ -120,9 +120,9 @@ IceListenForWellKnownConnections ( strncpy (errorStringRet, "Malloc failed", errorLength); for (j = 0; j < i; j++) - free ((char *) (*listenObjsRet)[j]); + free ((*listenObjsRet)[j]); - free ((char *) *listenObjsRet); + free (*listenObjsRet); *listenObjsRet = NULL; status = 0; @@ -152,8 +152,8 @@ IceListenForWellKnownConnections ( _IceTransClose (transConns[i]); } - free ((char *) listenObjs); - free ((char *) transConns); + free (listenObjs); + free (transConns); return (status); } diff --git a/src/misc.c b/src/misc.c index d182ebd..1693446 100644 --- a/src/misc.c +++ b/src/misc.c @@ -439,7 +439,7 @@ _IceAddOpcodeMapping ( iceConn->his_min_opcode - hisOpcode], oldVec, oldsize * sizeof (_IceProcessMsgInfo)); - free ((char *) oldVec); + free (oldVec); for (i = hisOpcode + 1; i < iceConn->his_min_opcode; i++) { @@ -465,7 +465,7 @@ _IceAddOpcodeMapping ( memcpy (iceConn->process_msg_info, oldVec, oldsize * sizeof (_IceProcessMsgInfo)); - free ((char *) oldVec); + free (oldVec); for (i = iceConn->his_max_opcode + 1; i < hisOpcode; i++) { diff --git a/src/process.c b/src/process.c index 2708ee8..f072674 100644 --- a/src/process.c +++ b/src/process.c @@ -960,7 +960,7 @@ ProcessConnectionSetup ( for (i = 0; i < hisAuthCount; i++) free (hisAuthNames[i]); - free ((char *) hisAuthNames); + free (hisAuthNames); } IceDisposeCompleteMessage (iceConn, pStart); @@ -1078,7 +1078,7 @@ ProcessConnectionSetup ( } if (authData && authDataLen > 0) - free ((char *) authData); + free (authData); if (errorString) free (errorString); @@ -1098,7 +1098,7 @@ ProcessConnectionSetup ( for (i = 0; i < hisAuthCount; i++) free (hisAuthNames[i]); - free ((char *) hisAuthNames); + free (hisAuthNames); } IceDisposeCompleteMessage (iceConn, pStart); @@ -1292,7 +1292,7 @@ ProcessAuthRequired ( } if (replyData && replyDataLen > 0) - free ((char *) replyData); + free (replyData); IceDisposeCompleteMessage (iceConn, authData); @@ -1377,7 +1377,7 @@ ProcessAuthReply ( { free (iceConn->connect_to_me->his_vendor); free (iceConn->connect_to_me->his_release); - free ((char *) iceConn->connect_to_me); + free (iceConn->connect_to_me); iceConn->connect_to_me = NULL; iceConn->connection_status = IceConnectRejected; @@ -1405,7 +1405,7 @@ ProcessAuthReply ( iceConn->my_ice_version_index = iceConn->connect_to_me->my_version_index; - free ((char *) iceConn->connect_to_me); + free (iceConn->connect_to_me); iceConn->connect_to_me = NULL; } } @@ -1571,7 +1571,7 @@ ProcessAuthReply ( free (iceConn->protosetup_to_me->his_vendor); if (iceConn->protosetup_to_me->his_release) free (iceConn->protosetup_to_me->his_release); - free ((char *) iceConn->protosetup_to_me); + free (iceConn->protosetup_to_me); iceConn->protosetup_to_me = NULL; } } @@ -1585,7 +1585,7 @@ ProcessAuthReply ( } if (authData && authDataLen > 0) - free ((char *) authData); + free (authData); if (errorString) free (errorString); @@ -1719,7 +1719,7 @@ ProcessAuthNextPhase ( } if (replyData && replyDataLen > 0) - free ((char *) replyData); + free (replyData); IceDisposeCompleteMessage (iceConn, authData); @@ -2005,7 +2005,7 @@ ProcessProtocolSetup ( for (i = 0; i < hisAuthCount; i++) free (hisAuthNames[i]); - free ((char *) hisAuthNames); + free (hisAuthNames); } IceDisposeCompleteMessage (iceConn, pStart); @@ -2117,7 +2117,7 @@ ProcessProtocolSetup ( } if (authData && authDataLen > 0) - free ((char *) authData); + free (authData); if (errorString) free (errorString); @@ -2219,7 +2219,7 @@ ProcessProtocolSetup ( for (i = 0; i < hisAuthCount; i++) free (hisAuthNames[i]); - free ((char *) hisAuthNames); + free (hisAuthNames); } IceDisposeCompleteMessage (iceConn, pStart); @@ -2364,7 +2364,7 @@ ProcessPingReply ( (*iceConn->ping_waits->ping_reply_proc) (iceConn, iceConn->ping_waits->client_data); - free ((char *) iceConn->ping_waits); + free (iceConn->ping_waits); iceConn->ping_waits = next; } else diff --git a/src/protosetup.c b/src/protosetup.c index 255b912..f10b030 100644 --- a/src/protosetup.c +++ b/src/protosetup.c @@ -237,8 +237,8 @@ IceProtocolSetup ( } if (iceConn->protosetup_to_you->my_auth_indices) - free ((char *) iceConn->protosetup_to_you->my_auth_indices); - free ((char *) iceConn->protosetup_to_you); + free (iceConn->protosetup_to_you->my_auth_indices); + free (iceConn->protosetup_to_you); iceConn->protosetup_to_you = NULL; } } diff --git a/src/replywait.c b/src/replywait.c index eb3a814..d4cf898 100644 --- a/src/replywait.c +++ b/src/replywait.c @@ -149,7 +149,7 @@ _IceCheckReplyReady ( else prev->next = savedReplyWait->next; - free ((char *) savedReplyWait); + free (savedReplyWait); } return (ready); diff --git a/src/shutdown.c b/src/shutdown.c index 14874a0..5def0b4 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -301,21 +301,21 @@ _IceFreeConnection ( free (iceConn->scratch); if (iceConn->process_msg_info) - free ((char *) iceConn->process_msg_info); + free (iceConn->process_msg_info); if (iceConn->connect_to_you) - free ((char *) iceConn->connect_to_you); + free (iceConn->connect_to_you); if (iceConn->protosetup_to_you) - free ((char *) iceConn->protosetup_to_you); + free (iceConn->protosetup_to_you); if (iceConn->connect_to_me) - free ((char *) iceConn->connect_to_me); + free (iceConn->connect_to_me); if (iceConn->protosetup_to_me) - free ((char *) iceConn->protosetup_to_me); + free (iceConn->protosetup_to_me); - free ((char *) iceConn); + free (iceConn); } diff --git a/src/watch.c b/src/watch.c index e414e19..42fb715 100644 --- a/src/watch.c +++ b/src/watch.c @@ -116,7 +116,7 @@ IceRemoveConnectionWatch ( while (watchedConn) { _IceWatchedConnection *nextWatchedConn = watchedConn->next; - free ((char *) watchedConn); + free (watchedConn); watchedConn = nextWatchedConn; } @@ -125,7 +125,7 @@ IceRemoveConnectionWatch ( else prevWatchProc->next = nextWatchProc; - free ((char *) currWatchProc); + free (currWatchProc); } } @@ -193,7 +193,7 @@ _IceConnectionClosed ( else prev->next = watchedConn->next; - free ((char *) watchedConn); + free (watchedConn); } watchProc = watchProc->next; -- cgit v1.2.3