Fix dlog format error 48/195748/2 accepted/tizen/unified/20181220.061606 submit/tizen/20181219.093432
authorsinikang <sinikang@samsung.com>
Tue, 18 Dec 2018 00:26:45 +0000 (09:26 +0900)
committersinikang <sinikang@samsung.com>
Wed, 19 Dec 2018 00:19:05 +0000 (09:19 +0900)
Change-Id: I38b4f2cbc859f9c37657354ff658716155c6094c

packaging/org.tizen.ciss.spec
src/ciss-parser.c
src/ciss-resp.c
src/ciss-respnd.c
src/ciss-tapi-request.c
src/ciss-util.c
src/ciss-widget.c

index ef83185..48bd59e 100644 (file)
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 2
+%define patchlevel 3
 
 Name:       org.tizen.ciss
 Summary:    CISS-MMI application
index 08be993..8579a98 100644 (file)
@@ -271,12 +271,12 @@ static unsigned char __ciss_parse_mmi_string(ciss_mmi_context_t *mmi_ctx, int *e
                                (ss_operation != registerPassword)) {
                        if (ss_operation != interrogateSS) {
                                if (strlen(sia) < 4) {
-                                       DBG("\n [CISS-ENGINE] Pwd Too Short : %d", strlen(sia));
+                                       DBG("\n [CISS-ENGINE] Pwd Too Short : %zu", strlen(sia));
                                        ss_operation = NULL_SS_OPERATION;
                                        *error_code = CISS_ERR_CB_PWD_TOO_SORT;
                                        return ss_operation;
                                } else if (strlen(sia) > 4) {
-                                       DBG("\n [CISS-ENGINE] Pwd Too long : %d", strlen(sia));
+                                       DBG("\n [CISS-ENGINE] Pwd Too long : %zu", strlen(sia));
                                        ss_operation = NULL_SS_OPERATION;
                                        *error_code = CISS_ERR_CB_PWD_TOO_LONG;
                                        return ss_operation;
@@ -292,7 +292,7 @@ static unsigned char __ciss_parse_mmi_string(ciss_mmi_context_t *mmi_ctx, int *e
                if ((strlen(sia) != 4) ||
                                (strlen(sib) != 4) ||
                                (strlen(sic) != 4)) {
-                       DBG("\n [CISS-ENGINE] Pwd Length Incorrect : %d %d %d", strlen(sia), strlen(sib), strlen(sic));
+                       DBG("\n [CISS-ENGINE] Pwd Length Incorrect : %zu %zu %zu", strlen(sia), strlen(sib), strlen(sic));
                        memset(mmi_ctx->ss_password, '\0', CISS_MAX_PASSWORD_LEN + 1);
                        memset(mmi_ctx->ss_new_password, '\0', CISS_MAX_PASSWORD_LEN + 1);
                        memset(mmi_ctx->ss_new_password2, '\0', CISS_MAX_PASSWORD_LEN + 1);
index 2fc349e..8fbfa61 100644 (file)
@@ -349,7 +349,7 @@ static void __ciss_ui_mmi_create_mmi_result_string(ciss_result_t *pSSResult, int
        if (pSSResult->szSsType == CISS_SERVICE_FORWARDING) {
                if ((strcmp(flavor, CISS_STR_CALL_FORWARDING_ACTIVE_C_WHEN_NOREPLY) == 0) &&
                                (pSSResult->nForwardWaitingTime[index] != 0)) {
-                       text = g_strdup_printf(CISS_STR_PD_SECONDS, pSSResult->nForwardWaitingTime[index]);
+                       text = g_strdup_printf("%s %d",CISS_STR_PD_SECONDS, pSSResult->nForwardWaitingTime[index]);
                        snprintf(szBuffer, CISS_TEXT_LEN_MAX, "%s %s", flavor, text);
                        free(text);
                } else {
@@ -414,7 +414,7 @@ static TelSsForwardResp_t* __ciss_tapi_handle_forward_cnf(ciss_result_t *ciss_re
                ss_forward_info.record[0].ForwardCondition,
                ss_forward_info.record[0].Status);
 
-       DBG("\n [CISS-ENGINE] ss_forward_info.record[0].szCallForwardingNumber : %s %d",
+       DBG("\n [CISS-ENGINE] ss_forward_info.record[0].szCallForwardingNumber : %s %zu",
                ss_forward_info.record[0].szCallForwardingNumber,
                strlen((char *)ss_forward_info.record[0].szCallForwardingNumber));
        _ciss_get_forward_flavor_type(ss_forward_info.record[0].ForwardCondition,
index e3869b0..e47d653 100644 (file)
@@ -99,7 +99,7 @@ void _ciss_respond_cb(void *data, Evas_Object *obj, void *event_info)
                return;
        }
 
-       DBG("The data is %s %d \n", ussd_str, strlen(buf));
+       DBG("The data is %s %zu \n", ussd_str, strlen(buf));
 
        memset(&mmi_ctx, 0x0, sizeof(ciss_mmi_context_t));
        mmi_ctx.opcode = unstructuredSS_Request;
index 44f6502..fcde845 100644 (file)
@@ -58,7 +58,7 @@ static gboolean __ciss_tapi_init(ciss_appdata_t *ad)
        while (cp_list[modem_num]) {
                if (modem_num < CISS_TAPI_HANDLE_MAX) {
                        ad->multi_handles[modem_num] = tel_init(cp_list[modem_num]);
-                       DBG("ad->multi_handles[modem_num] = 0x%x", ad->multi_handles[modem_num]);
+                       DBG("ad->multi_handles[%d] = 0x%p", modem_num, ad->multi_handles[modem_num]);
                        modem_num++;
                } else {
                        DBG("Couldn't support this handle. cp_list[%d]:%s", modem_num, cp_list[modem_num]);
index bc85478..8612e44 100644 (file)
@@ -27,7 +27,7 @@ char *_ciss_strcpy(char *pBuffer, int nBufCount, const char *pszString)
                strncpy(pBuffer, pszString, (int)strlen(pszString));
                pBuffer[(int)strlen(pszString)] = '\0';
        } else {
-               DBG("\n [CISS-ENGINE] _ciss_strcpy:short of buffer..BufCount=%d, strlen=%d, str=%s\n", nBufCount, strlen(pszString), pszString);
+               DBG("\n [CISS-ENGINE] _ciss_strcpy:short of buffer..BufCount=%d, strlen=%zu, str=%s\n", nBufCount, strlen(pszString), pszString);
                strncpy(pBuffer, pszString, (nBufCount - 1));
                pBuffer[nBufCount - 1] = '\0';
        }
index 1e23950..641e7bd 100644 (file)
@@ -1521,13 +1521,13 @@ void _ciss_create_genlist_underline(Evas_Object *genlist, void *data)
 void _ciss_hide_navi_title(void *data, Evas_Object *obj, void *event_info)
 {
        ret_if(data == NULL);
-       DBG("data = 0x%x", data);
+       DBG("data = 0x%p", data);
 }
 
 void _ciss_show_navi_title(void *data, Evas_Object *obj, void *event_info)
 {
        ret_if(data == NULL);
-       DBG("data = 0x%x", data);
+       DBG("data = 0x%p", data);
        ciss_appdata_t *ad = (ciss_appdata_t *)data;
        elm_naviframe_item_title_enabled_set(elm_naviframe_top_item_get(ad->nf), EINA_TRUE , EINA_TRUE);
 }