From c36d4b4c99b3c653fbff5daf662f5c30c157c421 Mon Sep 17 00:00:00 2001
From: Jaeyun <jy1210.jung@samsung.com>
Date: Fri, 22 Jul 2022 19:04:01 +0900
Subject: [PATCH] [CodeClean] remove glib function

Update source to remove dependency to glib.

Signed-off-by: Jaeyun <jy1210.jung@samsung.com>
---
 .../nnstreamer-edge-common.c                  | 21 +++++++++++++++----
 .../nnstreamer-edge-common.h                  |  6 ++++++
 .../nnstreamer-edge-internal.c                |  8 +++----
 src/libnnstreamer-edge/nnstreamer-edge-mqtt.c |  8 +++----
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/libnnstreamer-edge/nnstreamer-edge-common.c b/src/libnnstreamer-edge/nnstreamer-edge-common.c
index 7c29e7f..9466fe8 100644
--- a/src/libnnstreamer-edge/nnstreamer-edge-common.c
+++ b/src/libnnstreamer-edge/nnstreamer-edge-common.c
@@ -88,14 +88,27 @@ char *
 nns_edge_strdup (const char *str)
 {
   char *new_str = NULL;
-  size_t len;
 
-  if (str) {
-    len = strlen (str);
+  if (str)
+    new_str = nns_edge_strndup (str, strlen (str));
+
+  return new_str;
+}
 
+/**
+ * @brief Allocate new memory and copy bytes of string.
+ * @note Caller should release newly allocated string using nns_edge_free().
+ */
+char *
+nns_edge_strndup (const char *str, size_t len)
+{
+  char *new_str = NULL;
+
+  if (str) {
     new_str = (char *) malloc (len + 1);
+
     if (new_str) {
-      memcpy (new_str, str, len);
+      strncpy (new_str, str, len);
       new_str[len] = '\0';
     } else {
       nns_edge_loge ("Failed to allocate memory (%zd).", len + 1);
diff --git a/src/libnnstreamer-edge/nnstreamer-edge-common.h b/src/libnnstreamer-edge/nnstreamer-edge-common.h
index 24a98a4..1d36637 100644
--- a/src/libnnstreamer-edge/nnstreamer-edge-common.h
+++ b/src/libnnstreamer-edge/nnstreamer-edge-common.h
@@ -107,6 +107,12 @@ void *nns_edge_memdup (const void *data, size_t size);
  */
 char *nns_edge_strdup (const char *str);
 
+/**
+ * @brief Allocate new memory and copy bytes of string.
+ * @note Caller should release newly allocated string using nns_edge_free().
+ */
+char *nns_edge_strndup (const char *str, size_t len);
+
 /**
  * @brief Allocate new memory and print formatted string.
  * @note Caller should release newly allocated string using nns_edge_free().
diff --git a/src/libnnstreamer-edge/nnstreamer-edge-internal.c b/src/libnnstreamer-edge/nnstreamer-edge-internal.c
index 2732eb5..a34d3b0 100644
--- a/src/libnnstreamer-edge/nnstreamer-edge-internal.c
+++ b/src/libnnstreamer-edge/nnstreamer-edge-internal.c
@@ -152,11 +152,11 @@ _receive_raw_data (GSocket * socket, void *data, size_t size)
 static void
 _parse_host_str (const char *host, char **ip, int *port)
 {
-  char *p = g_strrstr (host, ":");
+  char *p = strchr (host, ':');
 
   if (p) {
-    *ip = g_strndup (host, (p - host));
-    *port = (int) g_ascii_strtoll (p + 1, NULL, 10);
+    *ip = nns_edge_strndup (host, (p - host));
+    *port = (int) strtoll (p + 1, NULL, 10);
   }
 }
 
@@ -1511,7 +1511,7 @@ nns_edge_respond (nns_edge_h edge_h, nns_edge_data_h data_h)
     return NNS_EDGE_ERROR_INVALID_PARAMETER;
   }
 
-  client_id = g_ascii_strtoll (val, NULL, 10);
+  client_id = strtoll (val, NULL, 10);
   SAFE_FREE (val);
 
   conn_data = _nns_edge_get_connection (eh, client_id);
diff --git a/src/libnnstreamer-edge/nnstreamer-edge-mqtt.c b/src/libnnstreamer-edge/nnstreamer-edge-mqtt.c
index 3443672..3b3544c 100644
--- a/src/libnnstreamer-edge/nnstreamer-edge-mqtt.c
+++ b/src/libnnstreamer-edge/nnstreamer-edge-mqtt.c
@@ -181,8 +181,8 @@ nns_edge_mqtt_connect (nns_edge_h edge_h)
   nns_edge_logi ("Trying to connect MQTT (ID:%s, URL:%s:%d).",
       eh->id, eh->ip, eh->port);
 
-  url = g_strdup_printf ("%s:%d", eh->ip, eh->port);
-  client_id = g_strdup_printf ("nns_edge_%s_%u", eh->id, getpid ());
+  url = nns_edge_strdup_printf ("%s:%d", eh->ip, eh->port);
+  client_id = nns_edge_strdup_printf ("nns_edge_%s_%u", eh->id, getpid ());
 
   ret = MQTTAsync_create (&handle, url, client_id,
       MQTTCLIENT_PERSISTENCE_NONE, NULL);
@@ -212,8 +212,8 @@ nns_edge_mqtt_connect (nns_edge_h edge_h)
   ret = NNS_EDGE_ERROR_NONE;
 
 error:
-  g_free (url);
-  g_free (client_id);
+  nns_edge_free (url);
+  nns_edge_free (client_id);
   return ret;
 }
 
-- 
2.34.1