Remove duplicate code

Change-Id: Iaf7eef3c7b403332da8333d0db63f532c189c31a
Signed-off-by: mk5004.lee <mk5004.lee@samsung.com>

diff --git a/watchface-complication-provider/watchface-complication-provider.cc b/watchface-complication-provider/watchface-complication-provider.cc
index d891d64..2baf697 100644 (file)
--- a/watchface-complication-provider/watchface-complication-provider.cc
+++ b/watchface-complication-provider/watchface-complication-provider.cc
@@ -333,7 +333,6 @@ static int _get_data_type(bundle *shared_data, watchface_complication_type_e *ty
 
 extern "C" EXPORT_API int watchface_complication_provider_data_set_type(
     bundle* shared_data, watchface_complication_type_e type) {
-  int ret;
   char num_str[32] = {0,};
 
   if (shared_data == NULL || !util::CheckComplicationType(static_cast<int>(type))) {
@@ -342,11 +341,7 @@ extern "C" EXPORT_API int watchface_complication_provider_data_set_type(
   }
 
   snprintf(num_str, sizeof(num_str), "%d", type);
-  ret = _add_bundle_data(shared_data, DATA_TYPE_KEY, num_str);
-  if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
-      return ret;
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return _add_bundle_data(shared_data, DATA_TYPE_KEY, num_str);
 }
 
 extern "C" EXPORT_API int watchface_complication_provider_data_set_title(
@@ -370,11 +365,7 @@ extern "C" EXPORT_API int watchface_complication_provider_data_set_title(
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = _add_bundle_data(shared_data, TITLE_KEY, title);
-  if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
-      return ret;
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return _add_bundle_data(shared_data, TITLE_KEY, title);
 }
 
 extern "C" EXPORT_API int watchface_complication_provider_data_set_short_text(
@@ -397,11 +388,7 @@ extern "C" EXPORT_API int watchface_complication_provider_data_set_short_text(
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = _add_bundle_data(shared_data, SHORT_TEXT_KEY, text);
-  if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
-      return ret;
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return _add_bundle_data(shared_data, SHORT_TEXT_KEY, text);
 }
 
 extern "C" EXPORT_API int watchface_complication_provider_data_set_long_text(
@@ -422,11 +409,7 @@ extern "C" EXPORT_API int watchface_complication_provider_data_set_long_text(
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = _add_bundle_data(shared_data, LONG_TEXT_KEY, text);
-  if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
-      return ret;
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return _add_bundle_data(shared_data, LONG_TEXT_KEY, text);
 }
 
 extern "C" EXPORT_API int watchface_complication_provider_data_set_timestamp(
@@ -449,11 +432,7 @@ extern "C" EXPORT_API int watchface_complication_provider_data_set_timestamp(
   }
 
   snprintf(num_str, sizeof(num_str), "%ld", timestamp);
-  ret = _add_bundle_data(shared_data, TIME_KEY, num_str);
-  if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
-      return ret;
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return _add_bundle_data(shared_data, TIME_KEY, num_str);
 }
 
 extern "C" EXPORT_API int watchface_complication_provider_data_set_image_path(
@@ -474,12 +453,7 @@ extern "C" EXPORT_API int watchface_complication_provider_data_set_image_path(
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = _add_bundle_data(shared_data, IMAGE_KEY, image_path);
-  if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
-      return ret;
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
-
+  return _add_bundle_data(shared_data, IMAGE_KEY, image_path);
 }
 
 extern "C" EXPORT_API int watchface_complication_provider_data_set_ranged_value(
@@ -542,27 +516,17 @@ extern "C" EXPORT_API int watchface_complication_provider_data_set_icon_path(
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = _add_bundle_data(shared_data, ICON_KEY, icon_path);
-  if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
-      return ret;
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return _add_bundle_data(shared_data, ICON_KEY, icon_path);
 }
 
 extern "C" EXPORT_API int watchface_complication_provider_data_set_extra_data(
     bundle* shared_data, const char* extra_data) {
-  int ret;
-
   if (shared_data == NULL || extra_data == NULL) {
     LOGE("Invalid param");
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = _add_bundle_data(shared_data, EXTRA_DATA_KEY, extra_data);
-  if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
-    return ret;
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return _add_bundle_data(shared_data, EXTRA_DATA_KEY, extra_data);
 }
 
 extern "C" EXPORT_API int watchface_complication_provider_data_set_screen_reader_text(
@@ -624,6 +588,7 @@ static int _get_value_from_touch_launch_data(app_control_h handle,
     LOGE("Fail to get data (%d)", ret);
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
+
   data = bundle_decode(reinterpret_cast<const bundle_raw*>(bundle_str),
     strlen(bundle_str));
   free(bundle_str);
@@ -638,12 +603,14 @@ static int _get_value_from_touch_launch_data(app_control_h handle,
     bundle_free(data);
     return WATCHFACE_COMPLICATION_ERROR_NO_DATA;
   }
+
   *value = strdup(bundle_val);
   if (*value == NULL) {
     LOGE("Out of memory");
     bundle_free(data);
     return WATCHFACE_COMPLICATION_ERROR_OUT_OF_MEMORY;
   }
+
   bundle_free(data);
 
   return WATCHFACE_COMPLICATION_ERROR_NONE;
@@ -658,6 +625,7 @@ extern "C" EXPORT_API int watchface_complication_provider_touch_launch_get_provi
     LOGE("Invalid param");
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
+
   ret = _get_value_from_touch_launch_data(handle,
       TOUCH_LAUNCH_PROVIDER_ID_KEY, &value);
   if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)

diff --git a/watchface-complication/watchface-complication.cc b/watchface-complication/watchface-complication.cc
index d420e4b..954219e 100644 (file)
--- a/watchface-complication/watchface-complication.cc
+++ b/watchface-complication/watchface-complication.cc
@@ -252,23 +252,23 @@ extern "C" EXPORT_API int watchface_complication_data_get_type(
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-extern "C" EXPORT_API int watchface_complication_data_get_short_text(
-    const bundle *data, char **short_text) {
+static int __get_complication_data(const bundle *data, const char *key, char **text) {
   int ret;
   char *value = NULL;
 
-  if (data == NULL || short_text == NULL) {
+  if (key == NULL) {
     LOGE("Invalid param !!");
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = bundle_get_str(const_cast<bundle*>(data), SHORT_TEXT_KEY, &value);
+  ret = bundle_get_str(const_cast<bundle*>(data), key, &value);
   if (ret != BUNDLE_ERROR_NONE) {
     LOGE("Invalid data !!");
     return WATCHFACE_COMPLICATION_ERROR_NO_DATA;
   }
-  *short_text = strdup(value);
-  if (*short_text == NULL) {
+
+  *text = strdup(value);
+  if (*text == NULL) {
     LOGE("Out of memory");
     return WATCHFACE_COMPLICATION_ERROR_OUT_OF_MEMORY;
   }
@@ -276,52 +276,34 @@ extern "C" EXPORT_API int watchface_complication_data_get_short_text(
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
+extern "C" EXPORT_API int watchface_complication_data_get_short_text(
+    const bundle *data, char **short_text) {
+  if (data == NULL || short_text == NULL) {
+    LOGE("Invalid param !!");
+    return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
+  }
+
+  return __get_complication_data(data, SHORT_TEXT_KEY, short_text);
+}
+
 extern "C" EXPORT_API int watchface_complication_data_get_long_text(
     const bundle *data, char **long_text) {
-  int ret;
-  char *value = NULL;
-
   if (data == NULL || long_text == NULL) {
     LOGE("Invalid param !!");
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = bundle_get_str(const_cast<bundle*>(data), LONG_TEXT_KEY, &value);
-  if (ret != BUNDLE_ERROR_NONE) {
-    LOGE("Invalid data !!");
-    return WATCHFACE_COMPLICATION_ERROR_NO_DATA;
-  }
-  *long_text = strdup(value);
-  if (*long_text == NULL) {
-    LOGE("Out of memory");
-    return WATCHFACE_COMPLICATION_ERROR_OUT_OF_MEMORY;
-  }
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return __get_complication_data(data, LONG_TEXT_KEY, long_text);
 }
 
 extern "C" EXPORT_API int watchface_complication_data_get_title(
     const bundle *data, char **title) {
-  int ret;
-  char *value = NULL;
-
   if (data == NULL || title == NULL) {
     LOGE("Invalid param !!");
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = bundle_get_str(const_cast<bundle*>(data), TITLE_KEY, &value);
-  if (ret != BUNDLE_ERROR_NONE) {
-    LOGE("Invalid data !!");
-    return WATCHFACE_COMPLICATION_ERROR_NO_DATA;
-  }
-  *title = strdup(value);
-  if (*title == NULL) {
-    LOGE("Out of memory");
-    return WATCHFACE_COMPLICATION_ERROR_OUT_OF_MEMORY;
-  }
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return __get_complication_data(data, TITLE_KEY, title);
 }
 
 extern "C" EXPORT_API int watchface_complication_data_get_timestamp(
@@ -346,26 +328,12 @@ extern "C" EXPORT_API int watchface_complication_data_get_timestamp(
 
 extern "C" EXPORT_API int watchface_complication_data_get_image_path(
     const bundle *data, char **image_path) {
-  int ret;
-  char *value = NULL;
-
   if (data == NULL || image_path == NULL) {
     LOGE("Invalid param !!");
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = bundle_get_str(const_cast<bundle*>(data), IMAGE_KEY, &value);
-  if (ret != BUNDLE_ERROR_NONE) {
-    LOGE("Invalid data !!");
-    return WATCHFACE_COMPLICATION_ERROR_NO_DATA;
-  }
-  *image_path = strdup(value);
-  if (*image_path == NULL) {
-    LOGE("Out of memory");
-    return WATCHFACE_COMPLICATION_ERROR_OUT_OF_MEMORY;
-  }
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return __get_complication_data(data, IMAGE_KEY, image_path);
 }
 
 extern "C" EXPORT_API int watchface_complication_data_get_ranged_value(
@@ -409,75 +377,32 @@ extern "C" EXPORT_API int watchface_complication_data_get_ranged_value(
 
 extern "C" EXPORT_API int watchface_complication_data_get_icon_path(
     const bundle *data, char **icon_path) {
-  int ret;
-  char *value = NULL;
-
   if (data == NULL || icon_path == NULL) {
     LOGE("Invalid param !!");
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = bundle_get_str(const_cast<bundle*>(data), ICON_KEY, &value);
-  if (ret != BUNDLE_ERROR_NONE) {
-    LOGE("Invalid data !!");
-    return WATCHFACE_COMPLICATION_ERROR_NO_DATA;
-  }
-  *icon_path = strdup(value);
-  if (*icon_path == NULL) {
-    LOGE("Out of memory");
-    return WATCHFACE_COMPLICATION_ERROR_OUT_OF_MEMORY;
-  }
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return __get_complication_data(data, ICON_KEY, icon_path);
 }
 
 extern "C" EXPORT_API int watchface_complication_data_get_extra_data(
     const bundle *data, char **extra_data) {
-  int ret;
-  char *value = NULL;
-
   if (data == NULL || extra_data == NULL) {
     LOGE("Invalid param !!");
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = bundle_get_str(const_cast<bundle*>(data), EXTRA_DATA_KEY, &value);
-  if (ret != BUNDLE_ERROR_NONE) {
-    LOGE("Invalid data !!");
-    return WATCHFACE_COMPLICATION_ERROR_NO_DATA;
-  }
-  *extra_data = strdup(value);
-  if (*extra_data == NULL) {
-    LOGE("Out of memory");
-    return WATCHFACE_COMPLICATION_ERROR_OUT_OF_MEMORY;
-  }
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return __get_complication_data(data, EXTRA_DATA_KEY, extra_data);
 }
 
 extern "C" EXPORT_API int watchface_complication_data_get_screen_reader_text(
     const bundle *data, char **screen_reader_text) {
-  int ret;
-  char *value;
-
   if (data == NULL || screen_reader_text == NULL) {
     LOGE("Invalid data !!");
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
 
-  ret = bundle_get_str(const_cast<bundle*>(data), SCREEN_READER_TEXT_KEY, &value);
-  if (ret != BUNDLE_ERROR_NONE) {
-    LOGE("Invalid data !!");
-    return WATCHFACE_COMPLICATION_ERROR_NO_DATA;
-  }
-
-  *screen_reader_text = strdup(value);
-  if (*screen_reader_text == NULL) {
-    LOGE("Out of memory");
-    return WATCHFACE_COMPLICATION_ERROR_OUT_OF_MEMORY;
-  }
-
-  return WATCHFACE_COMPLICATION_ERROR_NONE;
+  return __get_complication_data(data, SCREEN_READER_TEXT_KEY, screen_reader_text);
 }
 
 extern "C" EXPORT_API int watchface_complication_touch_launch(