From 5ac4dc725f245521c4213e0a9ae73cccd1dbda2a Mon Sep 17 00:00:00 2001 From: Inkyun Kil Date: Thu, 2 Jan 2020 15:44:10 +0900 Subject: [PATCH] Fix build warning based on GCC-9 Change-Id: I19670cfd2e7a26f2d2ec68910d2005acc5e6369d Signed-off-by: Inkyun Kil --- include/alarm-internal.h | 2 +- server/alarm-manager-dbus.c | 4 ++-- server/alarm-manager-util.c | 11 +++-------- server/alarm-manager.c | 6 +++--- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/include/alarm-internal.h b/include/alarm-internal.h index 00b1c47..0370066 100644 --- a/include/alarm-internal.h +++ b/include/alarm-internal.h @@ -37,7 +37,7 @@ extern "C" { #define MAX_SERVICE_NAME_LEN 512 #define MAX_PKG_NAME_LEN MAX_SERVICE_NAME_LEN-8 #define MAX_PKG_ID_LEN 512 -#define MAX_APP_ID_LEN 512 +#define MAX_APP_ID_LEN 256 #define MIN_INEXACT_INTERVAL 600 #define REGULAR_UID_MIN 5000 diff --git a/server/alarm-manager-dbus.c b/server/alarm-manager-dbus.c index 8b50382..c158337 100644 --- a/server/alarm-manager-dbus.c +++ b/server/alarm-manager-dbus.c @@ -330,8 +330,8 @@ static void __alarm_send_noti_to_application_reply( GDBusConnection *conn; GError *error = NULL; alarm_id_t *reply_alarm_id = (alarm_id_t *)user_data; - char *service_name = NULL; - char *app_unique_name = NULL; + char *service_name = "NULL"; + char *app_unique_name = "NULL"; struct watch_info_t *watch_info; char log_message[ALARMMGR_LOG_MESSAGE_SIZE] = {0,}; diff --git a/server/alarm-manager-util.c b/server/alarm-manager-util.c index 55a078a..dce5c4b 100644 --- a/server/alarm-manager-util.c +++ b/server/alarm-manager-util.c @@ -510,10 +510,8 @@ void _save_alarm_info_log(const char *tag, __alarm_info_t *info) char *due_time_str = ctime(&(info->due_time)); if (due_time_str) due_time_str[strlen(due_time_str) - 1] = '\0'; /* to avoid new line */ - - char *timebuf = strdup(ctime(&info->due_time)); - if (timebuf) - timebuf[strlen(timebuf) - 1] = '\0'; /* to avoid new line */ + else + due_time_str = "NULL"; snprintf(log_message, sizeof(log_message), "alarmID: %d, uid: %d, caller : %s -> callee : %s, " @@ -523,10 +521,7 @@ void _save_alarm_info_log(const char *tag, __alarm_info_t *info) info->alarm_id, info->uid, info->app_unique_name, info->callee_pkgid, info->dst_service_name, info->dst_service_name_mod, info->alarm_info.alarm_type, info->alarm_info.mode.repeat, - info->alarm_info.mode.u_interval.interval, info->due_time, timebuf); - - if (timebuf) - free(timebuf); + info->alarm_info.mode.u_interval.interval, info->due_time, due_time_str); _save_module_log(tag, log_message); #endif /* _APPFW_FEATURE_ALARM_MANAGER_MODULE_LOG */ diff --git a/server/alarm-manager.c b/server/alarm-manager.c index 57506e8..a255289 100644 --- a/server/alarm-manager.c +++ b/server/alarm-manager.c @@ -192,7 +192,7 @@ static bool __get_cached_unique_name(int pid, char *unique_name, int size, bool data = (appid_cache_t *)g_hash_table_lookup(caller_appid_cache_table, GINT_TO_POINTER(pid)); if (data) { - snprintf(unique_name, MAX_APP_ID_LEN, "%s", data->unique_name); + snprintf(unique_name, size, "%s", data->unique_name); if (is_app) *is_app = data->is_app; LOGD("Get cached unique_name: %s, pid:%d", unique_name, pid); @@ -2053,7 +2053,7 @@ int alarm_manager_alarm_set_time(GVariant* parameters, pid_t pid) struct timespec cur_time; gint64 time_sec; time_t new_time; - char sender_id[MAX_APP_ID_LEN]; + char sender_id[MAX_APP_ID_LEN] = "NULL"; char log_message[ALARMMGR_LOG_MESSAGE_SIZE]; g_variant_get(parameters, "(x)", &time_sec); @@ -2536,7 +2536,7 @@ int alarm_manager_alarm_create_periodic(GVariant *parameters, uid_t uid, app_service_name, app_service_name_mod, NULL, NULL, &return_code)) { LOGE("Unable to create alarm! return_code[%d]", return_code); - strncpy(log_tag, "FAIL: CREATE PERIODIC", sizeof(log_tag) - 1); + strncpy(log_tag, "FAIL: CREAT PERIOD", sizeof(log_tag) - 1); snprintf(log_message, sizeof(log_message), "alarmID: %d, uid: %d, pid: %d, duetime: %d-%d-%d %02d:%02d:%02d", _alarm_id, uid, pid, alarm_info.start.year, alarm_info.start.month, alarm_info.start.day, alarm_info.start.hour, -- 2.7.4