Change the variable name

previous name('class') is not permitted on C++ build
so, I change the variable name to 'ss_class'

Change-Id: I4f52c6314ab5dfd0e3d31f63e4441902dde19338

diff --git a/include/type/ss.h b/include/type/ss.h
index 8e953512fd48d30817d2b5a6e3dcee057d9b7881..edb2fb8e371a499e1ec86334c0bfd1c9c972130d 100644 (file)
--- a/include/type/ss.h
+++ b/include/type/ss.h
@@ -278,7 +278,7 @@ enum telephony_ss_error {
 
 #define MAX_SS_BARRING_PASSWORD_LEN 4
 struct treq_ss_barring {
-       enum telephony_ss_class class;
+       enum telephony_ss_class ss_class;
        enum telephony_ss_barring_mode mode;
        char password[ MAX_SS_BARRING_PASSWORD_LEN ];
 };
@@ -291,7 +291,7 @@ struct treq_ss_barring_change_password {
 
 #define MAX_SS_FORWARDING_NUMBER_LEN 32
 struct treq_ss_forwarding {
-       enum telephony_ss_class class;
+       enum telephony_ss_class ss_class;
        enum telephony_ss_forwarding_mode mode;
        enum telephony_ss_forwarding_no_reply_time time;
        enum telephony_ss_forwarding_type_of_number ton;
@@ -300,7 +300,7 @@ struct treq_ss_forwarding {
 };
 
 struct treq_ss_waiting {
-       enum telephony_ss_class class;
+       enum telephony_ss_class ss_class;
 
 };
 
@@ -330,7 +330,7 @@ struct tresp_ss_general {
 struct tresp_ss_barring {
        int record_num;
        struct barring_info {
-               enum telephony_ss_class class;
+               enum telephony_ss_class ss_class;
                enum telephony_ss_status status;
                enum telephony_ss_barring_mode mode;
        } *record;
@@ -340,7 +340,7 @@ struct tresp_ss_barring {
 struct tresp_ss_forwarding {
        int record_num;
        struct forwarding_info {
-               enum telephony_ss_class class;
+               enum telephony_ss_class ss_class;
                enum telephony_ss_status status;
                enum telephony_ss_forwarding_mode mode;
                enum telephony_ss_forwarding_no_reply_time time;
@@ -355,7 +355,7 @@ struct tresp_ss_forwarding {
 struct tresp_ss_waiting {
        int record_num;
        struct waiting_info {
-               enum telephony_ss_class class;
+               enum telephony_ss_class ss_class;
                enum telephony_ss_status status;
        } *record;
        enum telephony_ss_error err;

diff --git a/packaging/libtcore.spec b/packaging/libtcore.spec
index 2c9c5c1c36f5074482630bf798ce9230abbaeef7..f9326af5652609e152fd50f16d643e0ba9e48c7d 100644 (file)
--- a/packaging/libtcore.spec
+++ b/packaging/libtcore.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 22
+%define patchlevel 23
 
 Name:           libtcore
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/server.c b/src/server.c
index a2ca509fe09aec5f0d1bfa297e2eefd2bb18a816..3bd5dcd30ba4bf8e5cf70b2dee6a0d5b0b59fbb3 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -1073,6 +1073,9 @@ GSList *tcore_server_get_modem_plugin_list(Server *s)
        GSList *modem_plugin_list = NULL;
        TcoreModem *modem;
 
+       if (s == NULL)
+               return NULL;
+
        for (list = s->modems; list; list = list->next) {
                modem = list->data;
                if (modem == NULL) {