projects
/
framework
/
appfw
/
alarm-manager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add license file
[framework/appfw/alarm-manager.git]
/
alarm-lib.c
diff --git
a/alarm-lib.c
b/alarm-lib.c
index
65bd6f8
..
049bff5
100755
(executable)
--- a/
alarm-lib.c
+++ b/
alarm-lib.c
@@
-329,6
+329,7
@@
EXPORT_API int alarmmgr_init(const char *appid)
int ret;
int i = 0;
int j = 0;
int ret;
int i = 0;
int j = 0;
+ int len = 0;
if (appid == NULL)
return ERR_ALARM_INVALID_PARAM;
if (appid == NULL)
return ERR_ALARM_INVALID_PARAM;
@@
-348,7
+349,10
@@
EXPORT_API int alarmmgr_init(const char *appid)
return ret;
memset(service_name_mod, 'a', MAX_SERVICE_NAME_LEN-1);
return ret;
memset(service_name_mod, 'a', MAX_SERVICE_NAME_LEN-1);
- strncpy(service_name, appid, MAX_PKG_NAME_LEN);
+
+ len = strlen("ALARM.");
+ strncpy(service_name, "ALARM.", len);
+ strncpy(service_name + len, appid, strlen(appid));
j=0;
j=0;
@@
-365,10
+369,8
@@
EXPORT_API int alarmmgr_init(const char *appid)
j++;
}
j++;
}
- strncat(service_name, ".ALARM", strlen(".ALARM"));
-
- strncat(service_name_mod, ".ALARM", strlen(".ALARM"));
-
+ ALARM_MGR_LOG_PRINT("[alarm-lib]: service_name %s\n", service_name);
+ ALARM_MGR_LOG_PRINT("[alarm-lib]: service_name_mod %s\n", service_name_mod);
dbus_error_init(&derror);
dbus_error_init(&derror);
@@
-811,8
+813,8
@@
EXPORT_API int alarmmgr_add_alarm_with_localtime(alarm_entry_t *alarm,
if (destination != NULL) {
memset(dst_service_name, 0,
if (destination != NULL) {
memset(dst_service_name, 0,
- strlen(destination) + strlen("
.ALARM
") + 2);
- snprintf(dst_service_name, MAX_SERVICE_NAME_LEN, "%s",
+ strlen(destination) + strlen("
ALARM.
") + 2);
+ snprintf(dst_service_name, MAX_SERVICE_NAME_LEN, "
ALARM.
%s",
destination);
memset(dst_service_name_mod,'a',MAX_SERVICE_NAME_LEN-1);
destination);
memset(dst_service_name_mod,'a',MAX_SERVICE_NAME_LEN-1);
@@
-833,9
+835,6
@@
EXPORT_API int alarmmgr_add_alarm_with_localtime(alarm_entry_t *alarm,
j++;
}
j++;
}
- strncat(dst_service_name, ".ALARM", strlen(".ALARM"));
- strncat(dst_service_name_mod, ".ALARM", strlen(".ALARM"));
-
if (!_send_alarm_create
(alarm_context, alarm_info, alarm_id, dst_service_name, dst_service_name_mod,
&error_code)) {
if (!_send_alarm_create
(alarm_context, alarm_info, alarm_id, dst_service_name, dst_service_name_mod,
&error_code)) {
@@
-1015,8
+1014,8
@@
EXPORT_API int alarmmgr_add_alarm(int alarm_type, time_t trigger_at_time,
if (destination != NULL) {
memset(dst_service_name, 0,
if (destination != NULL) {
memset(dst_service_name, 0,
- strlen(destination) + strlen("
.ALARM
") + 2);
- snprintf(dst_service_name, MAX_SERVICE_NAME_LEN, "%s",
+ strlen(destination) + strlen("
ALARM.
") + 2);
+ snprintf(dst_service_name, MAX_SERVICE_NAME_LEN, "
ALARM.
%s",
destination);
memset(dst_service_name_mod,'a',MAX_SERVICE_NAME_LEN-1);
destination);
memset(dst_service_name_mod,'a',MAX_SERVICE_NAME_LEN-1);
@@
-1036,9
+1035,6
@@
EXPORT_API int alarmmgr_add_alarm(int alarm_type, time_t trigger_at_time,
j++;
}
j++;
}
- strncat(dst_service_name, ".ALARM", strlen(".ALARM"));
- strncat(dst_service_name_mod, ".ALARM", strlen(".ALARM"));
-
if (!_send_alarm_create
(alarm_context, &alarm_info, alarm_id, dst_service_name,dst_service_name_mod,
&error_code)) {
if (!_send_alarm_create
(alarm_context, &alarm_info, alarm_id, dst_service_name,dst_service_name_mod,
&error_code)) {
@@
-1067,7
+1063,9
@@
EXPORT_API int alarmmgr_add_alarm_withcb(int alarm_type, time_t trigger_at_time,
int ret;
char appid[256];
int ret;
char appid[256];
- aul_app_get_appid_bypid(getpid(), appid, sizeof(appid));
+ ret = aul_app_get_appid_bypid(getpid(), appid, sizeof(appid));
+ if (ret != AUL_R_OK)
+ return ERR_ALARM_SYSTEM_FAIL;
ret = alarmmgr_init(appid);
if (ret < 0)
ret = alarmmgr_init(appid);
if (ret < 0)
@@
-1133,7
+1131,7
@@
EXPORT_API int alarmmgr_remove_alarm(alarm_id_t alarm_id)
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- ALARM_MGR_LOG_PRINT("[alarm-lib]:alarm_delete(
) is called\n"
);
+ ALARM_MGR_LOG_PRINT("[alarm-lib]:alarm_delete(
%d) is called\n", alarm_id
);
if (alarm_id <= 0) {
return ERR_ALARM_INVALID_ID;
if (alarm_id <= 0) {
return ERR_ALARM_INVALID_ID;
@@
-1298,8
+1296,8
@@
int alarmmgr_create(alarm_info_t *alarm_info, char *destination,
if (destination != NULL) {
memset(dst_service_name, 0,
if (destination != NULL) {
memset(dst_service_name, 0,
- strlen(destination) + strlen("
.ALARM
") + 2);
- snprintf(dst_service_name, MAX_SERVICE_NAME_LEN, "
%s.ALARM
",
+ strlen(destination) + strlen("
ALARM.
") + 2);
+ snprintf(dst_service_name, MAX_SERVICE_NAME_LEN, "
ALARM.%s
",
destination);
if (!_send_alarm_create
(alarm_context, alarm_info, alarm_id, dst_service_name,"null",
destination);
if (!_send_alarm_create
(alarm_context, alarm_info, alarm_id, dst_service_name,"null",