From: GangHeok Kim Date: Tue, 7 May 2013 03:32:36 +0000 (+0900) Subject: 1. Changed printf-like functions to dlog function X-Git-Tag: submit/tizen_2.1/20130514.053343~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3871dae6ced4a9447adb768a7c7d846188914f38;p=apps%2Fhome%2Fmobileprint.git 1. Changed printf-like functions to dlog function 2. Changed unsecure functions Change-Id: I3f0d5915cef611379c2c65359579bdb62a1939a0 --- diff --git a/mobileprint/app/pts_main_view.c b/mobileprint/app/pts_main_view.c index 17ea5c8..efeb2ef 100644 --- a/mobileprint/app/pts_main_view.c +++ b/mobileprint/app/pts_main_view.c @@ -1725,29 +1725,6 @@ static Evas_Object *create_toolbar_more_btn(Evas_Object *parent, Evas_Smart_Cb f return btn; } -#if 0 -char *get_preview_image_path(pts_core_data_t *ugd) -{ - PTS_TRACE_BEGIN; - PTS_RETV_IF(ugd == NULL, NULL, "ugd is NULL"); - - if (g_current_preview_path == NULL) { - g_current_preview_path = malloc(sizeof(char) * 4096); - } - - if ((ugd->pt_files.current_index >= 0) - && (ugd->pt_files.current_index < g_pages_count)) { - sprintf(g_current_preview_path, "/tmp/mobileprint/mobileprint_%04d.ppm", - ugd->pt_files.current_index + 1); - PTS_DEBUG("Preview image path is %s", g_current_preview_path); - PTS_TRACE_END; - return g_current_preview_path; - } - PTS_TRACE_END; - return NULL; -} -#endif - /* * Set accessability information - screen reader text */ diff --git a/mobileprint/preview_engine/lib/preview_task_model.c b/mobileprint/preview_engine/lib/preview_task_model.c index ffd4b2a..99bbae7 100644 --- a/mobileprint/preview_engine/lib/preview_task_model.c +++ b/mobileprint/preview_engine/lib/preview_task_model.c @@ -443,7 +443,7 @@ int add_preview_task_empty_page(struct preview_task_model *model, ptd->page = 0; ptd->task_type = PREVIEW_TASK_EMPTY_PAGE; - sprintf(ptd->out_pic_fname, PREVIEW_TEMP_DIR "/empty_page.ppm"); + strncpy(ptd->out_pic_fname, PREVIEW_TEMP_DIR "/empty_page.ppm", sizeof(ptd->out_pic_fname) - 1); ptd->is_task_ok = 0; ptd->conf = pmodel->conf; ptd->pmodel = pmodel; @@ -500,7 +500,7 @@ int add_preview_task(struct preview_task_model *model, int page, ptd->page = page; ptd->task_type = PREVIEW_TASK_GENERIC; - sprintf(ptd->out_pic_fname, + snprintf(ptd->out_pic_fname, sizeof(ptd->out_pic_fname), "/tmp/mobileprint/mobileprint_%04d.ppm", page); ptd->is_task_ok = 0; ptd->conf = pmodel->conf; diff --git a/mobileprint/previewgen/lib/page_preview.c b/mobileprint/previewgen/lib/page_preview.c index 499b581..247efef 100644 --- a/mobileprint/previewgen/lib/page_preview.c +++ b/mobileprint/previewgen/lib/page_preview.c @@ -559,7 +559,7 @@ int generate_pdf_preview_pages(const char *fname, }*/ for (cur_page = 0; cur_page < pages_count; ++cur_page) { - sprintf(out_fname, "/tmp/mobileprint_%04d.ppm", cur_page + 1); + snprintf(out_fname, sizeof(out_fname), "/tmp/mobileprint_%04d.ppm", cur_page + 1); save_pdf_preview_page_image(fname, cur_page + 1, &settings_req, out_fname); diff --git a/mobileprint/previewgen/lib/previewgen.c b/mobileprint/previewgen/lib/previewgen.c index 5b4ddab..8db4a5c 100644 --- a/mobileprint/previewgen/lib/previewgen.c +++ b/mobileprint/previewgen/lib/previewgen.c @@ -73,11 +73,11 @@ int call_pdftoppm(const char *path, const struct pdf_preview_settings *settings) } x_val_str[0] = '\0'; - sprintf(x_val_str, "%d", settings->w); + snprintf(x_val_str, sizeof(x_val_str), "%d", settings->w); y_val_str[0] = '\0'; - sprintf(y_val_str, "%d", settings->h); + snprintf(y_val_str, sizeof(y_val_str), "%d", settings->h); page_str[0] = '\0'; - sprintf(page_str, "%d", settings->page); + snprintf(page_str, sizeof(page_str), "%d", settings->page); cmd_len = (sizeof(conv_cmd) - 1) diff --git a/mobileprint/smsc/lib/smsc_smart.c b/mobileprint/smsc/lib/smsc_smart.c index c429001..6622288 100644 --- a/mobileprint/smsc/lib/smsc_smart.c +++ b/mobileprint/smsc/lib/smsc_smart.c @@ -68,9 +68,8 @@ typedef struct _Evas_Smart_Smsc_Data Evas_Smart_Smsc_Data; #define EVAS_SMART_SMSC_DATA_GET_OR_RETURN(o, ptr) \ EVAS_SMART_SMSC_DATA_GET(o, ptr); \ if (!ptr) { \ - fprintf(stderr, "No widget data for object %p (%s)!", \ + SMSC_DEBUG("No widget data for object %p (%s)!", \ o, evas_object_type_get(o)); \ - fflush(stderr); \ abort(); \ return; \ } @@ -78,9 +77,8 @@ typedef struct _Evas_Smart_Smsc_Data Evas_Smart_Smsc_Data; #define EVAS_SMART_SMSC_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ EVAS_SMART_SMSC_DATA_GET(o, ptr); \ if (!ptr) { \ - fprintf(stderr, "No widget data for object %p (%s)!", \ + SMSC_DEBUG("No widget data for object %p (%s)!", \ o, evas_object_type_get(o)); \ - fflush(stderr); \ abort(); \ return val; \ } diff --git a/mobileprint/smsc/lib/smsc_widget.c b/mobileprint/smsc/lib/smsc_widget.c index 7a208dc..1e0fbc0 100644 --- a/mobileprint/smsc/lib/smsc_widget.c +++ b/mobileprint/smsc/lib/smsc_widget.c @@ -50,7 +50,7 @@ int add_smsc_widget_page(struct smsc_widget *widget, int page_num) posx = get_smsc_position_page(&(widget->position), page_num, &is_ok); SMSC_RETV_IF(!is_ok, -1, "Error in page position"); - sprintf(img_fname, PREVIEW_TEMP_DIR "/mobileprint_%04d.ppm", + snprintf(img_fname, sizeof(img_fname), PREVIEW_TEMP_DIR "/mobileprint_%04d.ppm", page_num + 1); page_data = (struct smsc_page_data*) malloc(sizeof(struct smsc_page_data)); @@ -139,7 +139,7 @@ int update_smsc_widget_page(struct smsc_widget *widget, int page_num) != PREVIEW_PAGE_STATE_READY) return -1; - sprintf(img_fname, PREVIEW_TEMP_DIR + snprintf(img_fname, sizeof(img_fname), PREVIEW_TEMP_DIR "/mobileprint_%04d.ppm", page_num + 1); SMSC_DEBUG("page_num = %d", page_num);