diff --git a/sysSentry-1.0.2/src/libso/xalarm/register_xalarm.c b/sysSentry-1.0.2/src/libso/xalarm/register_xalarm.c index 82b7ddda458465c9b3f56407f6d95cb26ed70122..80aa40840d5e81a015381b2f90df883c7165a1e8 100644 --- a/sysSentry-1.0.2/src/libso/xalarm/register_xalarm.c +++ b/sysSentry-1.0.2/src/libso/xalarm/register_xalarm.c @@ -110,10 +110,7 @@ static int create_unix_socket(const char *path) } } - if (memset(&alarm_addr, 0, sizeof(alarm_addr)) == NULL) { - printf("create_unix_socket: memset alarm_addr failed, ret: %d\n", ret); - goto release_socket; - } + memset(&alarm_addr, 0, sizeof(alarm_addr)); alarm_addr.sun_family = AF_UNIX; strncpy(alarm_addr.sun_path, path, sizeof(alarm_addr.sun_path) - 1); @@ -323,10 +320,7 @@ static int init_report_addr(struct sockaddr_un *alarm_addr, char *report_path) return -1; } - if (memset(alarm_addr, 0, sizeof(struct sockaddr_un)) == NULL) { - fprintf(stderr, "%s: memset alarm_addr failed, ret: %d\n", __func__, ret); - return -1; - } + memset(alarm_addr, 0, sizeof(struct sockaddr_un)); alarm_addr->sun_family = AF_UNIX; strncpy(alarm_addr->sun_path, report_path, sizeof(alarm_addr->sun_path) - 1); diff --git a/sysSentry-1.0.2/src/python/syssentry/alarm.py b/sysSentry-1.0.2/src/python/syssentry/alarm.py index 43c1065e3a2b1870f5328d86275452ebb38f4fcb..2e030e3a2bb5b002cbc218b99ddfc65fefad06ec 100644 --- a/sysSentry-1.0.2/src/python/syssentry/alarm.py +++ b/sysSentry-1.0.2/src/python/syssentry/alarm.py @@ -49,7 +49,7 @@ MAX_ALARM_ID = (MIN_ALARM_ID + MAX_NUM_OF_ALARM_ID - 1) def update_alarm_list(alarm_info: Xalarm): alarm_id = xalarm_getid(alarm_info) if alarm_id < MIN_ALARM_ID or alarm_id > MAX_ALARM_ID: - logging.warnning(f"Invalid alarm_id {alarm_id}") + logging.warning(f"Invalid alarm_id {alarm_id}") return timestamp = xalarm_gettime(alarm_info) if not timestamp: @@ -85,7 +85,7 @@ def alarm_register(): task = TasksMap.tasks_dict[task_type][task_name] alarm_id = task.alarm_id if alarm_id < MIN_ALARM_ID or alarm_id > MAX_ALARM_ID: - logging.warnning(f"Invalid alarm_id {alarm_id}: ignore {task_name} alarm") + logging.warning(f"Invalid alarm_id {alarm_id}: ignore {task_name} alarm") continue alarm_clear_time = task.alarm_clear_time try: @@ -95,7 +95,7 @@ def alarm_register(): if alarm_clear_time > sys.maxsize: raise ValueError("Exceeds maximum value for int") except (ValueError, OverflowError, TypeError) as e: - logging.warnning(f"Invalid alarm_clear_time {alarm_clear_time}: ignore {task_name} alarm") + logging.warning(f"Invalid alarm_clear_time {alarm_clear_time}: ignore {task_name} alarm") continue alarm_list_dict[alarm_id] = [] task_alarm_id_dict[task_name] = alarm_id diff --git a/sysSentry-1.0.2/src/python/syssentry/global_values.py b/sysSentry-1.0.2/src/python/syssentry/global_values.py index b123b2dcb7bcf8f94a30b43339f8f21dae5a038f..8031c215dc3f55bd15248d01d8c0fb0f60d4c2a7 100644 --- a/sysSentry-1.0.2/src/python/syssentry/global_values.py +++ b/sysSentry-1.0.2/src/python/syssentry/global_values.py @@ -73,7 +73,7 @@ class InspectTask: } # pull task self.onstart = False - # ccnfig env_file + # config env_file self.env_file = "" # start mode self.conflict = "up"