Fix build error

Change-Id: I6efbf251d55f366e86bb4a4fcb9c2ce7267c2aff

diff --git a/packaging/capi-network-softap.spec b/packaging/capi-network-softap.spec
index 13f3555b67f7e50bf22351d6dab88e9155737032..9a5fa895fd43269c3d1c3c1018cd367aa7233e9e 100644 (file)
--- a/packaging/capi-network-softap.spec
+++ b/packaging/capi-network-softap.spec
@@ -1,6 +1,6 @@
 Name:          capi-network-softap
 Summary:       Softap Framework
-Version:       0.1.1
+Version:       0.1.2
 Release:       1
 Group:         System/Network
 License:       Apache-2.0

diff --git a/src/softap.c b/src/softap.c
index eaeeed344498c7bbbf8388bbc14fcaf02738aaa0..bb7b12655316a928a96e86441490bda41a3600aa 100755 (executable)
--- a/src/softap.c
+++ b/src/softap.c
@@ -1240,7 +1240,7 @@ API int softap_foreach_connected_clients(softap_h softap, softap_connected_clien
                        "parameter(callback) is NULL\n");
 
        __softap_h *sa = (__softap_h *)softap;
-       __softap_client_h client = {"", };
+       __softap_client_h client = {"", "", NULL, 0};
        gchar *ip = NULL;
        gchar *mac = NULL;
        gchar *hostname = NULL;

diff --git a/tests/mocks/softap_gdbus.c b/tests/mocks/softap_gdbus.c
index e723e0ea1a33ea056d5eddcbd433961224013fb3..c6b905f3c8e1692feb5a45946ef3ab90746639cc 100644 (file)
--- a/tests/mocks/softap_gdbus.c
+++ b/tests/mocks/softap_gdbus.c
@@ -21,6 +21,10 @@
 #include <glib.h>
 #include <gio/gio.h>
 
+#ifndef API
+#define API __attribute__ ((visibility("default")))
+#endif
+
 typedef struct {
        GAsyncReadyCallback callback;
        gpointer user_data;
@@ -103,17 +107,17 @@ void softap_mock_emit_gdbus_signal(int signo)
                        params, gdbus_signal_callbacks[signo].user_data);
 }
 
-GCancellable *__wrap_g_cancellable_new(void)
+API GCancellable *__wrap_g_cancellable_new(void)
 {
        return (GCancellable *)g_object_new(G_TYPE_CANCELLABLE, NULL);
 }
 
-GDBusConnection *__wrap_g_bus_get_sync(GBusType bus_type, GCancellable *cancellable, GError **error)
+API GDBusConnection *__wrap_g_bus_get_sync(GBusType bus_type, GCancellable *cancellable, GError **error)
 {
        return (GDBusConnection *)g_object_new(G_TYPE_DBUS_CONNECTION, NULL);
 }
 
-GDBusProxy *__wrap_g_dbus_proxy_new_sync(GDBusConnection *connection,
+API GDBusProxy *__wrap_g_dbus_proxy_new_sync(GDBusConnection *connection,
                GDBusProxyFlags         flags,
                GDBusInterfaceInfo      *info,
                const gchar                     *name,
@@ -125,7 +129,7 @@ GDBusProxy *__wrap_g_dbus_proxy_new_sync(GDBusConnection *connection,
        return (GDBusProxy *)g_object_new(G_TYPE_DBUS_PROXY, NULL);
 }
 
-guint __wrap_g_dbus_connection_signal_subscribe(GDBusConnection         *connection,
+API guint __wrap_g_dbus_connection_signal_subscribe(GDBusConnection     *connection,
                const gchar                     *sender,
                const gchar                     *interface_name,
                const gchar                     *member,
@@ -146,7 +150,7 @@ guint __wrap_g_dbus_connection_signal_subscribe(GDBusConnection      *connection,
        return 0;
 }
 
-void __wrap_g_dbus_connection_signal_unsubscribe(GDBusConnection *connection,
+API void __wrap_g_dbus_connection_signal_unsubscribe(GDBusConnection *connection,
                guint subscription_id)
 {
        if (subscription_id >= SOFTAP_MOCK_GDBUS_SIGNAL_ON
@@ -205,7 +209,7 @@ static GVariant *_get_connected_clients_info(void)
        return params;
 }
 
-GVariant *__wrap_g_dbus_proxy_call_sync(GDBusProxy     *proxy,
+API GVariant *__wrap_g_dbus_proxy_call_sync(GDBusProxy *proxy,
                const gchar             *method_name,
                GVariant                *parameters,
                GDBusCallFlags  flags,
@@ -230,7 +234,7 @@ GVariant *__wrap_g_dbus_proxy_call_sync(GDBusProxy  *proxy,
        return params;
 }
 
-void __wrap_g_dbus_proxy_call(GDBusProxy       *proxy,
+API void __wrap_g_dbus_proxy_call(GDBusProxy   *proxy,
                const gchar             *method_name,
                GVariant                *parameters,
                GDBusCallFlags  flags,
@@ -243,13 +247,13 @@ void __wrap_g_dbus_proxy_call(GDBusProxy  *proxy,
        gdbus_async_callback.user_data = user_data;
 }
 
-GVariant *__wrap_g_dbus_proxy_call_finish(GDBusProxy *proxy,
+API GVariant *__wrap_g_dbus_proxy_call_finish(GDBusProxy *proxy,
                GAsyncResult *res, GError **error)
 {
        return g_variant_new("(u)", 0);
 }
 
-void __wrap_g_dbus_proxy_set_default_timeout(GDBusProxy *proxy, gint timeout_msec)
+API void __wrap_g_dbus_proxy_set_default_timeout(GDBusProxy *proxy, gint timeout_msec)
 {
        return;
 }

diff --git a/tests/mocks/softap_permission.c b/tests/mocks/softap_permission.c
index f7ff514ed9fbf014a318f2e0f72434780848eefc..df891f1d8fad95a1d1cb784ce686a9fceb36e22b 100644 (file)
--- a/tests/mocks/softap_permission.c
+++ b/tests/mocks/softap_permission.c
@@ -22,6 +22,10 @@
 #include <stdbool.h>
 #include <cynara-client.h>
 
+#ifndef API
+#define API __attribute__ ((visibility("default")))
+#endif
+
 static bool softap_mock_permission;
 
 void softap_mock_set_permission(bool value)
@@ -29,7 +33,7 @@ void softap_mock_set_permission(bool value)
        softap_mock_permission = value;
 }
 
-int __wrap_cynara_check(cynara *p_cynara,
+API int __wrap_cynara_check(cynara *p_cynara,
                const char *client, const char *client_session,
                const char *user, const char *privilege)
 {

diff --git a/tests/mocks/softap_vconf.c b/tests/mocks/softap_vconf.c
index 18b68fca8dc785881b4c095e28da12629da28eb2..c6e3aa9e3e2540c7e5a4d48bbc29f5cc2f15cf15 100644 (file)
--- a/tests/mocks/softap_vconf.c
+++ b/tests/mocks/softap_vconf.c
@@ -21,11 +21,13 @@
 #include <stdbool.h>
 #include <string.h>
 
+#ifndef API
+#define API __attribute__ ((visibility("default")))
+#endif
+
 static bool softap_mock_vconf_result;
 static bool softap_mock_enabled_state;
 
-extern int __real_vconf_get_int(const char *in_key, int *intval);
-
 void softap_mock_set_vconf_result(bool result)
 {
        softap_mock_vconf_result = result;
@@ -36,7 +38,7 @@ void softap_mock_set_enabled_state(bool enable)
        softap_mock_enabled_state = enable;
 }
 
-int __wrap_vconf_get_int(const char *in_key, int *intval)
+API int __wrap_vconf_get_int(const char *in_key, int *intval)
 {
        if (!softap_mock_vconf_result)
                return -1;
@@ -51,7 +53,7 @@ int __wrap_vconf_get_int(const char *in_key, int *intval)
        return 0;
 }
 
-char *__wrap_vconf_get_str(const char *key)
+API char *__wrap_vconf_get_str(const char *in_key)
 {
        if (!softap_mock_vconf_result)
                return NULL;