Navigator_Data create / free moved into separate functions, also minor refactoring

Change-Id: I13f711c678632ed9e73e61846e9f8d333e5c836e

diff --git a/src/navigator.c b/src/navigator.c
index c369318d971a5775e5a278af64d1440f6c4a343e..73c70812b90b4a621264f44a8e84b73fa66172e3 100644 (file)
--- a/src/navigator.c
+++ b/src/navigator.c
@@ -72,7 +72,6 @@
      error = NULL;\
    }
 
-static void on_window_activate(void *data, AtspiAccessible *window);
 static void _highlight_on_slider(Eina_Bool is_slider);
 
 typedef struct {
@@ -482,7 +481,7 @@ char *generate_state_trait(AtspiAccessible * obj)
 
        AtspiRole role = atspi_accessible_get_role(obj, NULL);
        AtspiStateSet *state_set = atspi_accessible_get_state_set(obj);
-       char ret[TTS_MAX_TEXT_SIZE] = "\0";
+       char ret[TTS_MAX_TEXT_SIZE] = "";
        switch (role) {
        case ATSPI_ROLE_LIST_ITEM: {
                AtspiAccessible *parent = atspi_accessible_get_parent(obj, NULL);
@@ -2586,7 +2585,7 @@ static void _view_content_changed(AtspiAccessible *root, void *user_data)
 {
        AtspiRole role = -1;
 
-       Service_Data *sd = (Service_Data *)user_data;
+       Service_Data *sd = (Service_Data*)user_data;
        if (sd == NULL) {
                ERROR("NULL context service_data");
                return;
@@ -2809,6 +2808,16 @@ void navigator_gestures_tracker_unregister(Navigator_Data *nd)
        eldbus_shutdown();
 }
 
+Navigator_Data *navigator_create()
+{
+       return calloc(1, sizeof(Navigator_Data));
+}
+
+void navigator_destroy(Navigator_Data *nd)
+{
+       free(nd);
+}
+
 Navigator_Data *navigator_init(Service_Data *sd)
 {
        DEBUG("START");
@@ -2818,10 +2827,9 @@ Navigator_Data *navigator_init(Service_Data *sd)
                return NULL;
        }
 
-       Navigator_Data *nd = calloc(1, sizeof(Navigator_Data));
-
+       Navigator_Data *nd = navigator_create();
        if (nd == NULL) {
-               ERROR("calloc(1,%d) failed", sizeof(Navigator_Data));
+               ERROR("failed to allocate Navigator_Data");
                return NULL;
        }