Fix build warnings for gcc 9

- Fix wrong code for getting facility value
- Fix buf size calculation for strncat

Change-Id: Ic94ff3436f7626077422034c510fce39e0ac707b
Signed-off-by: Semun Lee <semun.lee@samsung.com>

diff --git a/src/s_common.c b/src/s_common.c
index 00a2ece..1c12b4a 100644 (file)
--- a/src/s_common.c
+++ b/src/s_common.c
@@ -117,10 +117,10 @@ void util_hex_dump(char *pad, int size, const void *data)
 
        p = (unsigned const char *)data;
 
-       snprintf(buf, 255, "%s%04X: ", pad, 0);
+       snprintf(buf, sizeof(buf), "%s%04X: ", pad, 0);
        for (i = 0; i < size; i++) {
                snprintf(hex, 4, "%02X ", p[i]);
-               strncat(buf, hex, strlen(hex));
+               strncat(buf, hex, sizeof(buf) - strlen(buf) - 1);
 
                if ((i + 1) % 8 == 0) {
                        if ((i + 1) % 16 == 0) {

diff --git a/src/s_ss.c b/src/s_ss.c
index b84b86e..e0104c7 100644 (file)
--- a/src/s_ss.c
+++ b/src/s_ss.c
@@ -414,35 +414,35 @@ static guint __atmodem_ss_convert_class_to_atmodem_class(enum telephony_ss_class
 }
 
 static gboolean __atmodem_ss_convert_barring_type_to_facility(enum telephony_ss_barring_mode mode,
-       const char *facility)
+       const char **facility)
 {
        switch (mode) {
        case SS_BARR_MODE_BAOC:
-               facility = "AO";
+               *facility = "AO";
        break;
        case SS_BARR_MODE_BOIC:
-               facility = "OI";
+               *facility = "OI";
        break;
        case SS_BARR_MODE_BOIC_NOT_HC:
-               facility = "OX";
+               *facility = "OX";
        break;
        case SS_BARR_MODE_BAIC:
-               facility = "AI";
+               *facility = "AI";
        break;
        case SS_BARR_MODE_BIC_ROAM:
-               facility = "IR";
+               *facility = "IR";
        break;
        case SS_BARR_MODE_AB:
-               facility = "AB";
+               *facility = "AB";
        break;
        case SS_BARR_MODE_AOB:
-               facility = "AG";
+               *facility = "AG";
        break;
        case SS_BARR_MODE_AIB:
-               facility = "AC";
+               *facility = "AC";
        break;
        case SS_BARR_MODE_BIC_NOT_SIM:
-               facility = "NS";
+               *facility = "NS";
        break;
        default:
                err("Unspported type: [%d]", mode);
@@ -1048,7 +1048,7 @@ static TReturn _ss_barring_set(CoreObject *o, UserRequest *ur, enum telephony_ss
                mode = 0;
 
        if (__atmodem_ss_convert_barring_type_to_facility(
-                       barring_info->mode, facility) == FALSE) {
+                       barring_info->mode, &facility) == FALSE) {
                err("Invalid arguments");
                return ret;
        }
@@ -1095,7 +1095,7 @@ static TReturn _ss_barring_get(CoreObject *o,
        TReturn ret = TCORE_RETURN_FAILURE;
 
        if (__atmodem_ss_convert_barring_type_to_facility(
-               mode, facility) == FALSE) {
+               mode, &facility) == FALSE) {
                err("Invalid arguments");
                return ret;
        }