[Non-ACR] Fixing build error for x86_64 & aarch64 40/228640/1
authorAbhishek Vijay <abhishek.v@samsung.com>
Tue, 24 Mar 2020 09:08:09 +0000 (14:38 +0530)
committerAbhishek Vijay <abhishek.v@samsung.com>
Tue, 24 Mar 2020 09:17:04 +0000 (09:17 +0000)
Change-Id: I965863040393a0271dd8507e290dedf21c37f39a
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>
(cherry picked from commit b5d6d650d636a7d20d4330e29508a07294b63cf9)

src/bm_power_engine.c
src/bm_server.c

index 670561e..77b849b 100644 (file)
@@ -98,8 +98,8 @@ int bm_engine_get_mah_usage_by_app_id_for_resource_id_ci(const gchar* app_id, gi
        BM_CHECK_INPUT_PARAM(app_id);
        BM_RETURN_VAL((resource_id < BM_PLUGIN_ID_MAX), {},
                        BATTERY_MONITOR_ERROR_INVALID_PARAMETER, "invalid resource-id param");
-       _DBG("usage requested - app-id[%s], resource_id[%d], start_time [%lld] end_time[%lld]",
-                       app_id, resource_id, start_time, end_time);
+       _DBG("usage requested - app-id[%s], resource_id[%d], start_time [%ld] end_time[%ld]",
+                       app_id, resource_id, (long int)start_time,(long int)end_time);
 
        int error = BATTERY_MONITOR_ERROR_NONE;
        appid_usage_s *app_usage = bm_server_query_app_usage_by_appid_ci(app_id, start_time, end_time, &error);
@@ -184,8 +184,8 @@ int bm_engine_get_total_mah_usage_by_app_id_ci(const gchar* app_id, gint64 start
 
        BM_CHECK_INPUT_PARAM(app_id);
 
-       _DBG("usage requested - app-id[%s], start_time [%lld] end_time[%lld]",
-                       app_id, start_time, end_time);
+       _DBG("usage requested - app-id[%s], start_time [%ld] end_time[%ld]",
+                       app_id, (long int)start_time, (long int)end_time);
        int error = BATTERY_MONITOR_ERROR_NONE;
        appid_usage_s *app_usage = bm_server_query_app_usage_by_appid_ci(app_id, start_time, end_time, &error);
        if (!app_usage) {
@@ -258,8 +258,8 @@ int bm_engine_get_total_mah_usage_by_resource_id_ci(gint resource_id, gint64 sta
 
        BM_RETURN_VAL((resource_id < BM_PLUGIN_ID_MAX), {},
                        BATTERY_MONITOR_ERROR_INVALID_PARAMETER, "invalid resource-id");
-       _DBG("usage requested - resource_id[%d], start_time [%lld] end_time[%lld]",
-                       resource_id, start_time, end_time);
+       _DBG("usage requested - resource_id[%d], start_time [%ld] end_time[%ld]",
+                       resource_id, (long int)start_time, (long int)end_time);
 
        int error = BATTERY_MONITOR_ERROR_NONE;
        const char *resource_id_str = NULL;
@@ -332,7 +332,8 @@ int bm_engine_get_all_resource_usage_handle_ci(const gchar* app_id, gint64 start
        ENTER;
        BM_CHECK_INPUT_PARAM(app_id);
        BM_CHECK_INPUT_PARAM(battery_data);
-       _DBG("usage requested - app-id[%s], start_time[%lld] end_time[%lld]", app_id, start_time, end_time);
+       _DBG("usage requested - app-id[%s], start_time[%ld] end_time[%ld]", \
+                       app_id, (long int)start_time, (long int)end_time);
        int error = BATTERY_MONITOR_ERROR_NONE;
        appid_usage_s *app_usage = bm_server_query_app_usage_by_appid_ci(app_id, start_time, end_time, &error);
        if (!app_usage) {
index 8fbfa3b..ccd8ccb 100644 (file)
@@ -117,7 +117,8 @@ bm_get_mah_usage_by_app_id_for_resource_id_custom_interval(BatteryMonitor *obj,
 {
        ENTER;
 
-       _INFO("app_id [%s], resource_id [%d], start_time [%lld] end_time [%lld]", app_id, resource_id, start_time, end_time);
+       _INFO("app_id [%s], resource_id [%d], start_time [%ld] end_time [%ld]", \
+                       app_id, resource_id, (long int)start_time, (long int)end_time);
 
        if (!app_id || (resource_id >= BM_PLUGIN_ID_MAX)) {
                _ERR("invalid function param");
@@ -201,7 +202,8 @@ bm_get_total_mah_usage_by_app_id_custom_interval(BatteryMonitor *obj, GDBusMetho
 {
        ENTER;
 
-       _INFO("app_id(%s), start_time (%lld), end_time (%lld)", app_id, start_time, end_time);
+       _INFO("app_id(%s), start_time (%ld), end_time (%ld)", \
+                               app_id, (long int)start_time, (long int)end_time);
 
        if (!app_id) {
                _ERR("invalid function param");
@@ -285,7 +287,8 @@ bm_get_total_mah_usage_by_resource_id_custom_interval(BatteryMonitor *obj, GDBus
 {
        ENTER;
 
-       _INFO("resource_id [%d], start_time [%lld] end_time [%lld]", resource_id, start_time, end_time);
+       _INFO("resource_id [%d], start_time [%ld] end_time [%ld]", \
+                                       resource_id, (long int)start_time, (long int)end_time);
 
        if (resource_id >= BM_PLUGIN_ID_MAX) {
                _ERR("invalid function param");
@@ -393,7 +396,8 @@ bm_get_usage_handle_by_app_id_for_all_resource_id_custom_interval(BatteryMonitor
 {
        ENTER;
 
-       _INFO("app_id [%s], start_time [%lld] end_time [%lld]", app_id, start_time, end_time);
+       _INFO("app_id [%s], start_time [%ld] end_time [%ld]", \
+                       app_id, (long int)start_time, (long int)end_time);
 
        if (!app_id) {
                _ERR("invalid function param");