Fix for 64-bit build compatibility

Change-Id: Ib122519313ffbe4f4e3cce05a4ca6c607dd16c1e
Signed-off-by: Jiwan Kim <ji-wan.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4f1b15..3269c56 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ PROJECT(ps-plugin C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
 SET(DATAROOTDIR "\${prefix}/share")
 if(NOT DEFINED SYSCONFDIR)
@@ -68,7 +68,7 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/dnet_db.sql DESTINATION ${DATAROOTDI
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/dnet_db_init.sql DESTINATION ${DATAROOTDIR}/ps-plugin)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/apns-conf.xml DESTINATION ${DATAROOTDIR}/ps-plugin)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/520.tel-plugin-packetservice.patch.sh DESTINATION ${SYSCONFDIR}/opt/upgrade)
-INSTALL(TARGETS ps-plugin LIBRARY DESTINATION lib/telephony/plugins)
+INSTALL(TARGETS ps-plugin LIBRARY DESTINATION ${LIBDIR}/telephony/plugins)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME tel-plugin-packetservice)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/dump_packetservice.sh DESTINATION /opt/etc/dump.d/module.d)
 IF (TIZEN_ENGINEER_MODE)

diff --git a/packaging/tel-plugin-packetservice.spec b/packaging/tel-plugin-packetservice.spec
index 3b6a615..3b770dd 100755 (executable)
--- a/packaging/tel-plugin-packetservice.spec
+++ b/packaging/tel-plugin-packetservice.spec
@@ -33,7 +33,9 @@ Telephony Packet Service library
 %setup -q
 
 %build
-%cmake . -DSYSCONFDIR=%{_sysconfdir}
+%cmake . -DSYSCONFDIR=%{_sysconfdir} \
+       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DLIB_INSTALL_DIR=%{_libdir}
 make %{?jobs:-j%jobs}
 
 %post

diff --git a/src/context.c b/src/context.c
index 7ae1d45..a7c92a2 100755 (executable)
--- a/src/context.c
+++ b/src/context.c
@@ -1186,7 +1186,7 @@ static gboolean __ps_context_remove_profile_tuple(dictionary *dic, int profile_i
 
        //network info id
        section_key = g_strdup_printf("connection:network_info_id_%d", profile_index);
-       network_info_id = iniparser_getstr(dic, section_key);
+       network_info_id = iniparser_getstring(dic, section_key, NULL);
        g_hash_table_insert(in_param, "1", g_strdup(network_info_id));
        g_free(section_key);
 
@@ -1228,7 +1228,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *profile_id;
                gchar* item_key = NULL;
                item_key = g_strdup_printf("connection:profile_id_%d", profile_index);
-               profile_id = iniparser_getstr(dic, item_key);
+               profile_id = iniparser_getstring(dic, item_key, NULL);
                g_hash_table_insert(in_param, "1", g_strdup(profile_id));
                g_free(item_key);
        }
@@ -1237,7 +1237,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *profile_name;
                gchar* item_key = NULL;
                item_key = g_strdup_printf("connection:profile_name_%d", profile_index);
-               profile_name = iniparser_getstr(dic, item_key);
+               profile_name = iniparser_getstring(dic, item_key, NULL);
                g_hash_table_insert(in_param, "2", g_strdup(profile_name));
                g_free(item_key);
        }
@@ -1246,7 +1246,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *apn;
                gchar *item_key = NULL;
                item_key = g_strdup_printf("connection:apn_%d", profile_index);
-               apn = iniparser_getstr(dic, item_key);
+               apn = iniparser_getstring(dic, item_key, NULL);
                g_hash_table_insert(in_param, "3", g_strdup(apn));
                g_free(item_key);
        }
@@ -1255,7 +1255,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *auth_type;
                gchar *item_key = NULL;
                item_key = g_strdup_printf("connection:auth_type_%d", profile_index);
-               auth_type = iniparser_getstr(dic, item_key);
+               auth_type = iniparser_getstring(dic, item_key, NULL);
                g_hash_table_insert(in_param, "4", g_strdup(auth_type));
                g_free(item_key);
        }
@@ -1264,7 +1264,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *auth_id;
                gchar *item_key = NULL;
                item_key = g_strdup_printf("connection:auth_id_%d", profile_index);
-               auth_id = iniparser_getstr(dic, item_key);
+               auth_id = iniparser_getstring(dic, item_key, NULL);
                g_hash_table_insert(in_param, "5", g_strdup(auth_id));
                g_free(item_key);
        }
@@ -1273,7 +1273,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *auth_pwd;
                gchar *item_key = NULL;
                item_key = g_strdup_printf("connection:auth_pwd_%d", profile_index);
-               auth_pwd = iniparser_getstr(dic, item_key);
+               auth_pwd = iniparser_getstring(dic, item_key, NULL);
                g_hash_table_insert(in_param, "6", g_strdup(auth_pwd));
                g_free(item_key);
        }
@@ -1282,7 +1282,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *pdp_protocol;
                gchar *item_key = NULL;
                item_key = g_strdup_printf("connection:pdp_protocol_%d", profile_index);
-               pdp_protocol = iniparser_getstr(dic, item_key);
+               pdp_protocol = iniparser_getstring(dic, item_key, NULL);
                g_hash_table_insert(in_param, "7", g_strdup(pdp_protocol));
                g_free(item_key);
        }
@@ -1291,7 +1291,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *proxy_ip_addr;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:proxy_ip_addr_%d", profile_index);
-               proxy_ip_addr = iniparser_getstr(dic, section_key);
+               proxy_ip_addr = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "8", g_strdup(proxy_ip_addr));
                g_free(section_key);
        }
@@ -1300,7 +1300,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *home_url;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:home_url_%d", profile_index);
-               home_url = iniparser_getstr(dic, section_key);
+               home_url = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "9", g_strdup(home_url));
                g_free(section_key);
        }
@@ -1309,7 +1309,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *linger_time;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:linger_time_%d", profile_index);
-               linger_time = iniparser_getstr(dic, section_key);
+               linger_time = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "10", g_strdup(linger_time));
                g_free(section_key);
        }
@@ -1318,7 +1318,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *traffic_class;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:traffic_class_%d", profile_index);
-               traffic_class = iniparser_getstr(dic, section_key);
+               traffic_class = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "11", g_strdup(traffic_class));
                g_free(section_key);
        }
@@ -1327,7 +1327,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *is_static_ip_addr;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:is_static_ip_addr_%d", profile_index);
-               is_static_ip_addr = iniparser_getstr(dic, section_key);
+               is_static_ip_addr = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "12", g_strdup(is_static_ip_addr));
                g_free(section_key);
        }
@@ -1336,7 +1336,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *ip_addr;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:ip_addr_%d", profile_index);
-               ip_addr = iniparser_getstr(dic, section_key);
+               ip_addr = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "13", g_strdup(ip_addr));
                g_free(section_key);
        }
@@ -1345,7 +1345,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *is_static_dns_addr;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:is_static_dns_addr_%d", profile_index);
-               is_static_dns_addr = iniparser_getstr(dic, section_key);
+               is_static_dns_addr = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "14", g_strdup(is_static_dns_addr));
                g_free(section_key);
        }
@@ -1354,7 +1354,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *dns_addr1;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:dns_addr1_%d", profile_index);
-               dns_addr1 = iniparser_getstr(dic, section_key);
+               dns_addr1 = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "15", g_strdup(dns_addr1));
                g_free(section_key);
        }
@@ -1363,7 +1363,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *dns_addr2;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:dns_addr2_%d", profile_index);
-               dns_addr2 = iniparser_getstr(dic, section_key);
+               dns_addr2 = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "16", g_strdup(dns_addr2));
                g_free(section_key);
        }
@@ -1372,7 +1372,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *network_info_id;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:network_info_id_%d", profile_index);
-               network_info_id = iniparser_getstr(dic, section_key);
+               network_info_id = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "17", g_strdup(network_info_id));
                g_free(section_key);
        }
@@ -1381,7 +1381,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *svc_category_id;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:svc_category_id_%d", profile_index);
-               svc_category_id = iniparser_getstr(dic, section_key);
+               svc_category_id = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "18", g_strdup(svc_category_id));
                g_free(section_key);
        }
@@ -1390,7 +1390,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *hidden;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:hidden_%d", profile_index);
-               hidden = iniparser_getstr(dic, section_key);
+               hidden = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "19", g_strdup(hidden));
                g_free(section_key);
        }
@@ -1399,7 +1399,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *editable;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:editable_%d", profile_index);
-               editable = iniparser_getstr(dic, section_key);
+               editable = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "20", g_strdup(editable));
                g_free(section_key);
        }
@@ -1408,7 +1408,7 @@ static gboolean __ps_context_insert_profile_tuple(dictionary *dic, int profile_i
                gchar *default_internet_con;
                gchar *section_key = NULL;
                section_key = g_strdup_printf("connection:default_internet_con_%d", profile_index);
-               default_internet_con = iniparser_getstr(dic, section_key);
+               default_internet_con = iniparser_getstring(dic, section_key, NULL);
                g_hash_table_insert(in_param, "21", g_strdup(default_internet_con));
                g_free(section_key);
        }