From 1c0e96681ee030b84fc730a9c211beec34a3776d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Fri, 8 Jul 2011 11:44:24 -0400
Subject: [PATCH] * #6392: remove generate_call_id() used only once
inline the only use case and fix a memory leak
bug found by cppcheck
---
sflphone-client-gnome/src/callable_obj.c | 20 ++++++--------------
sflphone-client-gnome/src/callable_obj.h | 5 -----
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/sflphone-client-gnome/src/callable_obj.c b/sflphone-client-gnome/src/callable_obj.c
index f5e4df4949..97d722a198 100644
--- a/sflphone-client-gnome/src/callable_obj.c
+++ b/sflphone-client-gnome/src/callable_obj.c
@@ -214,7 +214,6 @@ void create_new_call (callable_type_t type, call_state_t state, gchar* callID ,
GError *err1 = NULL ;
callable_obj_t *obj;
- gchar *call_id;
DEBUG ("CallableObj: Create new call");
@@ -243,12 +242,14 @@ void create_new_call (callable_type_t type, call_state_t state, gchar* callID ,
set_timestamp (& (obj->_time_stop));
if (g_strcasecmp (callID, "") == 0)
- call_id = generate_call_id ();
+ {
+ obj->_callID = g_new0 (gchar, 30);
+ if (obj->_callID)
+ g_sprintf (obj->_callID, "%d", rand());
+ }
else
- call_id = callID;
+ obj->_callID = g_strdup (callID);
- // Set the IDs
- obj->_callID = g_strdup (call_id);
obj->clockStarted = 1;
if (obj->_type == CALL) {
@@ -397,15 +398,6 @@ void attach_thumbnail (callable_obj_t *call, GdkPixbuf *pixbuf)
call->_contact_thumbnail = pixbuf;
}
-gchar* generate_call_id (void)
-{
- gchar *call_id;
-
- call_id = g_new0 (gchar, 30);
- g_sprintf (call_id, "%d", rand());
- return call_id;
-}
-
gchar* get_peer_info (gchar* number, gchar* name)
{
gchar *info;
diff --git a/sflphone-client-gnome/src/callable_obj.h b/sflphone-client-gnome/src/callable_obj.h
index 34be817e23..f353fab3f0 100644
--- a/sflphone-client-gnome/src/callable_obj.h
+++ b/sflphone-client-gnome/src/callable_obj.h
@@ -222,11 +222,6 @@ free_callable_obj_t (callable_obj_t *c);
void
stop_call_clock (callable_obj_t *c);
-/**
- * @return gchar* A random ID
- */
-gchar* generate_call_id (void);
-
gchar* get_peer_info (gchar*, gchar*);
history_state_t get_history_state_from_id (gchar *indice);
--
GitLab