1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index 2cc7e4e..1381725 100644
5 @@ -12,9 +12,9 @@ INCLUDE_DIRECTORIES(${INC_DIR})
8 ADD_DEFINITIONS("-DWAYLAND_PLATFORM")
9 -SET(requires "dlog capi-base-common iniparser libxml-2.0")
10 +SET(requires "capi-base-common iniparser libxml-2.0")
12 -SET(requires "dlog capi-base-common xi xrandr iniparser libxml-2.0")
13 +SET(requires "capi-base-common xi xrandr iniparser libxml-2.0")
15 SET(pc_requires "capi-base-common")
17 diff --git a/src/system_info.c b/src/system_info.c
18 index 491f5b5..507499e 100644
19 --- a/src/system_info.c
20 +++ b/src/system_info.c
28 #include <system_info.h>
29 #include <system_info_private.h>
30 @@ -170,7 +170,7 @@ void __attribute__((constructor)) system_info_init(void)
31 ret = system_info_get_platform_string("tizen.org/system/model_name", &str);
33 if (ret != SYSTEM_INFO_ERROR_NONE) {
34 - LOGE("initialize error");
35 + //LOGE("initialize error");
39 @@ -204,24 +204,24 @@ int system_info_get_value(system_info_key_e key, system_info_data_type_e data_ty
40 system_info_get_value_cb system_info_getter;
43 - LOGE("INVALID_PARAMETER(0x%08x) : invalid output param", SYSTEM_INFO_ERROR_INVALID_PARAMETER);
44 + //LOGE("INVALID_PARAMETER(0x%08x) : invalid output param", SYSTEM_INFO_ERROR_INVALID_PARAMETER);
45 return SYSTEM_INFO_ERROR_INVALID_PARAMETER;
48 if (system_info_get(key, &system_info)) {
49 - LOGE("INVALID_PARAMETER(0x%08x) : invalid key", SYSTEM_INFO_ERROR_INVALID_PARAMETER);
50 + //LOGE("INVALID_PARAMETER(0x%08x) : invalid key", SYSTEM_INFO_ERROR_INVALID_PARAMETER);
51 return SYSTEM_INFO_ERROR_INVALID_PARAMETER;
54 if (system_info->data_type != data_type) {
55 - LOGE("INVALID_PARAMETER(0x%08x) : invalid data type", SYSTEM_INFO_ERROR_INVALID_PARAMETER);
56 + //LOGE("INVALID_PARAMETER(0x%08x) : invalid data type", SYSTEM_INFO_ERROR_INVALID_PARAMETER);
57 return SYSTEM_INFO_ERROR_INVALID_PARAMETER;
60 system_info_getter = system_info->get_value_cb;
62 if (system_info_getter == NULL) {
63 - LOGE("IO_ERROR(0x%08x) : failed to call getter for the system information", SYSTEM_INFO_ERROR_IO_ERROR);
64 + //LOGE("IO_ERROR(0x%08x) : failed to call getter for the system information", SYSTEM_INFO_ERROR_IO_ERROR);
65 return SYSTEM_INFO_ERROR_IO_ERROR;
68 @@ -257,13 +257,13 @@ API int system_info_get_platform_bool(const char *key, bool *value)
69 supported = (bool *)value;
71 if (access(CONFIG_FILE_PATH, R_OK)) {
72 - LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
73 + //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
74 return SYSTEM_INFO_ERROR_IO_ERROR;
77 ret = system_info_get_value_from_config_xml(PLATFORM_TAG, key, BOOL_TYPE, &string);
79 - LOGE("cannot get %s", key);
80 + //LOGE("cannot get %s", key);
84 @@ -286,13 +286,13 @@ API int system_info_get_platform_int(const char *key, int *value)
85 ret_val = (int *)value;
87 if (access(CONFIG_FILE_PATH, R_OK)) {
88 - LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
89 + //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
90 return SYSTEM_INFO_ERROR_IO_ERROR;
93 ret = system_info_get_value_from_config_xml(PLATFORM_TAG, key, INT_TYPE, &string);
95 - LOGE("cannot get %s", key);
96 + //LOGE("cannot get %s", key);
100 @@ -312,13 +312,13 @@ API int system_info_get_platform_double(const char *key, double *value)
101 ret_val = (double *)value;
103 if (access(CONFIG_FILE_PATH, R_OK)) {
104 - LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
105 + //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
106 return SYSTEM_INFO_ERROR_IO_ERROR;
109 ret = system_info_get_value_from_config_xml(PLATFORM_TAG, key, DBL_TYPE, &string);
111 - LOGE("cannot get %s", key);
112 + //LOGE("cannot get %s", key);
116 @@ -335,13 +335,13 @@ API int system_info_get_platform_string(const char *key, char **value)
119 if (access(CONFIG_FILE_PATH, R_OK)) {
120 - LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
121 + //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
122 return SYSTEM_INFO_ERROR_IO_ERROR;
125 ret = system_info_get_value_from_config_xml(PLATFORM_TAG, key, STR_TYPE, &string);
127 - LOGE("cannot get %s", key);
128 + //LOGE("cannot get %s", key);
132 @@ -359,13 +359,13 @@ API int system_info_get_custom_bool(const char *key, bool *value)
133 supported = (bool *)value;
135 if (access(CONFIG_FILE_PATH, R_OK)) {
136 - LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
137 + //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
138 return SYSTEM_INFO_ERROR_IO_ERROR;
141 ret = system_info_get_value_from_config_xml(CUSTOM_TAG, key, BOOL_TYPE, &string);
143 - LOGI("cannot get %s", key);
144 + //LOGI("cannot get %s", key);
146 return SYSTEM_INFO_ERROR_NONE;
148 @@ -389,13 +389,13 @@ API int system_info_get_custom_int(const char *key, int *value)
149 ret_val = (int *)value;
151 if (access(CONFIG_FILE_PATH, R_OK)) {
152 - LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
153 + //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
154 return SYSTEM_INFO_ERROR_IO_ERROR;
157 ret = system_info_get_value_from_config_xml(CUSTOM_TAG, key, INT_TYPE, &string);
159 - LOGI("cannot get %s", key);
160 + //LOGI("cannot get %s", key);
162 return SYSTEM_INFO_ERROR_NONE;
164 @@ -416,13 +416,13 @@ API int system_info_get_custom_double(const char *key, double *value)
165 ret_val = (double *)value;
167 if (access(CONFIG_FILE_PATH, R_OK)) {
168 - LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
169 + //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
170 return SYSTEM_INFO_ERROR_IO_ERROR;
173 ret = system_info_get_value_from_config_xml(CUSTOM_TAG, key, DBL_TYPE, &string);
175 - LOGI("cannot get %s", key);
176 + //LOGI("cannot get %s", key);
178 return SYSTEM_INFO_ERROR_NONE;
180 @@ -440,13 +440,13 @@ API int system_info_get_custom_string(const char *key, char **value)
183 if (access(CONFIG_FILE_PATH, R_OK)) {
184 - LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
185 + //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH);
186 return SYSTEM_INFO_ERROR_IO_ERROR;
189 ret = system_info_get_value_from_config_xml(CUSTOM_TAG, key, STR_TYPE, &string);
191 - LOGE("cannot get %s info from %s!!!", key, CONFIG_FILE_PATH);
192 + //LOGE("cannot get %s info from %s!!!", key, CONFIG_FILE_PATH);
196 diff --git a/src/system_info_device.c b/src/system_info_device.c
197 index 18752e4..2826c61 100644
198 --- a/src/system_info_device.c
199 +++ b/src/system_info_device.c
207 #include <system_info.h>
208 #include <system_info_private.h>
209 @@ -38,7 +38,7 @@ int system_info_get_manufacturer(system_info_key_e key, system_info_data_type_e
211 manufacturer = strdup("samsung");
212 if (manufacturer == NULL) {
213 - LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY);
214 + //LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY);
215 return SYSTEM_INFO_ERROR_OUT_OF_MEMORY;
218 @@ -61,7 +61,7 @@ int system_info_get_tethering_supported(system_info_key_e key, system_info_data_
221 if (system_info_get_value_from_xml(TETHERING_INFO_FILE_PATH, model, "tethering-support", &string)) {
222 - LOGE("cannot get tethering-support info from %s!!!", TETHERING_INFO_FILE_PATH);
223 + //LOGE("cannot get tethering-support info from %s!!!", TETHERING_INFO_FILE_PATH);
224 return SYSTEM_INFO_ERROR_IO_ERROR;
227 diff --git a/src/system_info_parse.c b/src/system_info_parse.c
228 index 0bc6b88..f3b412f 100644
229 --- a/src/system_info_parse.c
230 +++ b/src/system_info_parse.c
238 #include <system_info.h>
239 #include <system_info_private.h>
240 @@ -47,14 +47,14 @@ int system_info_ini_get_string(char *ini_file, char *key, char **output)
241 ini = iniparser_load(ini_file);
244 - LOGE("cannot file open %s file!!!", ini_file);
245 + //LOGE("cannot file open %s file!!!", ini_file);
246 return SYSTEM_INFO_ERROR_IO_ERROR;
249 str = iniparser_getstring(ini, key, NULL);
252 - LOGE("NOT found %s(0x%08x)", key, SYSTEM_INFO_ERROR_IO_ERROR);
253 + //LOGE("NOT found %s(0x%08x)", key, SYSTEM_INFO_ERROR_IO_ERROR);
254 iniparser_freedict(ini);
255 return SYSTEM_INFO_ERROR_IO_ERROR;
257 @@ -62,7 +62,7 @@ int system_info_ini_get_string(char *ini_file, char *key, char **output)
261 - LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY);
262 + //LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY);
263 iniparser_freedict(ini);
264 return SYSTEM_INFO_ERROR_OUT_OF_MEMORY;
266 @@ -86,13 +86,13 @@ int system_info_get_value_from_xml(char *xml_file_path, char *model, char *id_fi
267 doc = xmlParseFile(xml_file_path);
270 - LOGE("cannot file open %s file!!!", xml_file_path);
271 + //LOGE("cannot file open %s file!!!", xml_file_path);
272 return SYSTEM_INFO_ERROR_IO_ERROR;
275 cur = xmlDocGetRootElement(doc);
277 - LOGE("empty document %s file!!!", xml_file_path);
278 + //LOGE("empty document %s file!!!", xml_file_path);
280 return SYSTEM_INFO_ERROR_IO_ERROR;
282 @@ -103,7 +103,7 @@ int system_info_get_value_from_xml(char *xml_file_path, char *model, char *id_fi
286 - LOGE("cannot find %s root element file!!!", "sys-info");
287 + //LOGE("cannot find %s root element file!!!", "sys-info");
289 return SYSTEM_INFO_ERROR_IO_ERROR;
291 @@ -137,7 +137,7 @@ int system_info_get_value_from_xml(char *xml_file_path, char *model, char *id_fi
294 if (*value == NULL) {
295 - LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY);
296 + //LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY);
298 return SYSTEM_INFO_ERROR_OUT_OF_MEMORY;
300 @@ -170,7 +170,7 @@ int system_info_get_value_from_xml(char *xml_file_path, char *model, char *id_fi
303 if (*value == NULL) {
304 - LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY);
305 + //LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY);
307 return SYSTEM_INFO_ERROR_OUT_OF_MEMORY;
309 @@ -183,7 +183,7 @@ int system_info_get_value_from_xml(char *xml_file_path, char *model, char *id_fi
313 - LOGE("cannot find %s field from %s file!!!", id_field, xml_file_path);
314 + //LOGE("cannot find %s field from %s file!!!", id_field, xml_file_path);
316 return SYSTEM_INFO_ERROR_IO_ERROR;
318 @@ -201,13 +201,13 @@ int system_info_get_value_from_config_xml(char *feature_tag, const char *name_fi
319 doc = xmlParseFile(CONFIG_FILE_PATH);
322 - LOGE("cannot file open %s file!!!", CONFIG_FILE_PATH);
323 + //LOGE("cannot file open %s file!!!", CONFIG_FILE_PATH);
324 return SYSTEM_INFO_ERROR_IO_ERROR;
327 cur = xmlDocGetRootElement(doc);
329 - LOGE("empty document %s file!!!", CONFIG_FILE_PATH);
330 + //LOGE("empty document %s file!!!", CONFIG_FILE_PATH);
332 return SYSTEM_INFO_ERROR_IO_ERROR;
334 @@ -218,7 +218,7 @@ int system_info_get_value_from_config_xml(char *feature_tag, const char *name_fi
338 - LOGE("cannot find %s root element file!!!", MODEL_CONFIG_TAG);
339 + //LOGE("cannot find %s root element file!!!", MODEL_CONFIG_TAG);
341 return SYSTEM_INFO_ERROR_IO_ERROR;
343 @@ -231,7 +231,7 @@ int system_info_get_value_from_config_xml(char *feature_tag, const char *name_fi
346 if (model_node == NULL) {
347 - LOGE("cannot find %s field from %s file!!!", name_field, CONFIG_FILE_PATH);
348 + //LOGE("cannot find %s field from %s file!!!", name_field, CONFIG_FILE_PATH);
350 return SYSTEM_INFO_ERROR_IO_ERROR;
352 @@ -247,7 +247,7 @@ int system_info_get_value_from_config_xml(char *feature_tag, const char *name_fi
353 if (!strncmp(name, name_field, strlen(name))) {
354 if (!strncmp(name, name_field, strlen(name_field))) {
355 if (strncmp(type, type_field, strlen(type_field))) {
356 - LOGE("INVALID_PARAMETER(0x%08x) : invalid output param", SYSTEM_INFO_ERROR_INVALID_PARAMETER);
357 + //LOGE("INVALID_PARAMETER(0x%08x) : invalid output param", SYSTEM_INFO_ERROR_INVALID_PARAMETER);
361 @@ -270,13 +270,13 @@ int system_info_get_value_from_config_xml(char *feature_tag, const char *name_fi
365 - LOGE("cannot find %s field from %s file!!!", name_field, CONFIG_FILE_PATH);
366 + //LOGE("cannot find %s field from %s file!!!", name_field, CONFIG_FILE_PATH);
368 return SYSTEM_INFO_ERROR_IO_ERROR;
371 if (*value == NULL) {
372 - LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY);
373 + //LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY);
375 return SYSTEM_INFO_ERROR_OUT_OF_MEMORY;
377 diff --git a/src/system_info_platform.c b/src/system_info_platform.c
378 index 405004f..82abf9c 100644
379 --- a/src/system_info_platform.c
380 +++ b/src/system_info_platform.c
388 #include <system_info.h>
389 #include <system_info_private.h>
390 @@ -72,7 +72,7 @@ int system_info_get_core_cpu_arch(system_info_key_e key, system_info_data_type_e
391 CORE_CPU_ARCH = strdup("x86");
393 if (CORE_CPU_ARCH == NULL) {
394 - LOGE("Unknown cpu");
395 + //LOGE("Unknown cpu");
396 return SYSTEM_INFO_ERROR_IO_ERROR;
399 @@ -92,7 +92,7 @@ int system_info_get_core_cpu_freq(system_info_key_e key, system_info_data_type_e
400 if (system_info_get_system_info_model_type() != SYSTEM_INFO_MODEL_TYPE_EMULATOR) {
401 cpuinfo_max_freq = fopen(CPU_INFO_MAX_FREQ_PATH, "r");
402 if (NULL == cpuinfo_max_freq) {
403 - LOGE("cannot file open %s file!!!", CPU_INFO_MAX_FREQ_PATH);
404 + //LOGE("cannot file open %s file!!!", CPU_INFO_MAX_FREQ_PATH);
405 return SYSTEM_INFO_ERROR_IO_ERROR;
407 if (fscanf(cpuinfo_max_freq, "%lf", &max_freq) < 1) {
408 @@ -106,7 +106,7 @@ int system_info_get_core_cpu_freq(system_info_key_e key, system_info_data_type_e
410 cpuinfo = fopen(CPU_INFO_FILE_PATH, "r");
411 if (NULL == cpuinfo) {
412 - LOGE("cannot file open %s file!!!", CPU_INFO_FILE_PATH);
413 + //LOGE("cannot file open %s file!!!", CPU_INFO_FILE_PATH);
414 return SYSTEM_INFO_ERROR_IO_ERROR;
416 while (fgets(str, MAXBUFSIZE, cpuinfo)) {
417 @@ -144,7 +144,7 @@ int system_info_get_tizen_version_name(system_info_key_e key, system_info_data_t
419 info = fopen(OS_RELEASE_FILE_PATH, "r");
421 - LOGE("cannot file open %s file!!!", OS_RELEASE_FILE_PATH);
422 + //LOGE("cannot file open %s file!!!", OS_RELEASE_FILE_PATH);
423 return SYSTEM_INFO_ERROR_IO_ERROR;
426 @@ -159,7 +159,7 @@ int system_info_get_tizen_version_name(system_info_key_e key, system_info_data_t
428 TIZEN_VERSION_NAME = strdup(tmpStr);
429 if (TIZEN_VERSION_NAME == NULL) {
430 - LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY);
431 + //LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY);
433 return SYSTEM_INFO_ERROR_OUT_OF_MEMORY;
435 diff --git a/src/system_info_screen.c b/src/system_info_screen.c
436 index 9af9f81..c9979d7 100644
437 --- a/src/system_info_screen.c
438 +++ b/src/system_info_screen.c
446 #ifndef WAYLAND_PLATFORM
447 #include <X11/Xlib.h>
448 @@ -68,14 +68,14 @@ int system_info_screen_init()
449 memset(&g_pinfo, 0x0, sizeof(ProgInfo));
450 #ifdef WAYLAND_PLATFORM
451 //In wayland environment, noting to do in this function, FIXME if necessary.
452 - LOGE("In wayland environment, system_info_screen_init Failed");
453 + //LOGE("In wayland environment, system_info_screen_init Failed");
454 system_info_screen_initialized = 1;
458 g_pinfo.dpy = XOpenDisplay(NULL);
459 if (NULL == g_pinfo.dpy) {
460 - LOGE("XOpenDisplay Failed");
461 + //LOGE("XOpenDisplay Failed");
465 @@ -85,7 +85,7 @@ int system_info_screen_init()
467 if (!XRRQueryExtension(g_pinfo.dpy, &g_pinfo.event_base, &g_pinfo.error_base) ||
468 !XRRQueryVersion(g_pinfo.dpy, &g_pinfo.major, &g_pinfo.minor)) {
469 - LOGE("XRRQuery Failed");
470 + //LOGE("XRRQuery Failed");
471 XCloseDisplay(g_pinfo.dpy);
474 @@ -93,7 +93,7 @@ int system_info_screen_init()
475 g_pinfo.res = XRRGetScreenResources(g_pinfo.dpy, g_pinfo.root);
478 - LOGE("XRRGetScreenResources Failed");
479 + //LOGE("XRRGetScreenResources Failed");
480 XCloseDisplay(g_pinfo.dpy);
483 @@ -101,7 +101,7 @@ int system_info_screen_init()
484 for (i = 0; i < g_pinfo.res->noutput; i++) {
485 XRROutputInfo *output_info = XRRGetOutputInfo(g_pinfo.dpy, g_pinfo.res, g_pinfo.res->outputs[i]);
487 - LOGE("XRRGetOutputInfo Failed");
488 + //LOGE("XRRGetOutputInfo Failed");
489 XCloseDisplay(g_pinfo.dpy);