Fix For PTREL-286 : Multi-User Architecture Change updated for review comments

[platform/core/telephony/tel-plugin-imc.git] / src / s_common.c

diff --git a/src/s_common.c b/src/s_common.c
index 50ee24e..f07f003 100644 (file)
--- a/src/s_common.c
+++ b/src/s_common.c
@@ -99,6 +99,24 @@ unsigned char util_hexCharToInt(char c)
        }
 }
 
+char *util_hex_to_string(const char *src, unsigned int src_len)
+{
+       char *dest;
+       int i;
+
+       if (src == NULL)
+               return NULL;
+
+       dest = g_malloc0(src_len * 2 + 1);
+       for (i = 0; i < src_len; i++) {
+               sprintf(dest + (i * 2), "%02x", (unsigned char)src[i]);
+       }
+
+       dest[src_len * 2] = '\0';
+
+       return dest;
+}
+
 char* util_hexStringToBytes(char *s)
 {
        char *ret;
@@ -110,13 +128,13 @@ char* util_hexStringToBytes(char *s)
 
        sz = strlen(s);
 
-       ret = calloc((sz / 2) + 1, 1);
+       ret = g_try_malloc0((sz / 2) + 1);
 
        dbg("Convert String to Binary!!");
 
        for (i = 0; i < sz; i += 2) {
                ret[i / 2] = (char) ((util_hexCharToInt(s[i]) << 4) | util_hexCharToInt(s[i + 1]));
-               dbg("[%02x]", ret[i / 2]);
+               msg("           [%02x]", ret[i / 2]);
        }
 
        return ret;
@@ -185,9 +203,10 @@ char* util_removeQuotes(void *data)
        if (data_len <= 0) {
                return NULL;
        }
-       tmp = calloc(1, data_len - 1);
+
+       tmp = g_try_malloc0(data_len - 1);
        memcpy(tmp, data + 1, data_len - 2);
-       dbg("tmp: %s", tmp);
+       dbg("tmp: [%s]", tmp);
 
        return tmp;
 }