osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Alejandro Vaquero: 

replace the code that used g_strsplit_set and was broken by me
  changing it to g_strsplit with something that works


svn path=/trunk/; revision=13470
This commit is contained in:
Luis Ontanon 2005-02-22 19:37:46 +00:00
parent 7dccea9b20
commit 5926160fa9
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/voip_calls.c
View File

@ -1556,8 +1556,6 @@ gboolean isSignal(gchar *signal, gchar *signalStr)
*/
void mgcpCallerID(gchar *signalStr, gchar **callerId)
{
gint i;
gchar **resultArray;
gchar **arrayStr;
/* if there is no signalStr, just return false */
@ -1568,24 +1566,12 @@ void mgcpCallerID(gchar *signalStr, gchar **callerId)
if (arrayStr[0] == NULL) return;
/* look for the ci signal */
resultArray = g_strsplit(arrayStr[0], ",(", 10);
for (i = 0; resultArray[i]; i++) {
g_strstrip(resultArray[i]);
if (strcmp(resultArray[i], "ci") == 0){
if (arrayStr[1] != NULL){
/* free the previous "From" field of the call, and assign the new */
g_free(*callerId);
*callerId = g_strdup(arrayStr[1]);
}
g_strfreev(arrayStr);
g_strfreev(resultArray);
return;
}
if (g_strrstr(arrayStr[0], "ci(") && (arrayStr[1] != NULL) ) {
/* free the previous "From" field of the call, and assign the new */
g_free(*callerId);
*callerId = g_strdup(arrayStr[1]);
}
g_strfreev(arrayStr);
g_strfreev(resultArray);
return;
}