From 72def895431ad7a08e635b11f3da738e2b2c4618 Mon Sep 17 00:00:00 2001
From: wujiazhi <1147861305@qq.com>
Date: Thu, 13 Jun 2024 11:31:04 +0800
Subject: [PATCH] add lower model test
---
Soft/linked_list.c | 92 ++++++++++++++++++++--------------------------
1 files changed, 40 insertions(+), 52 deletions(-)
diff --git a/Soft/linked_list.c b/Soft/linked_list.c
index 290b323..1517ba3 100644
--- a/Soft/linked_list.c
+++ b/Soft/linked_list.c
@@ -30,33 +30,21 @@
//˫��ָ�룺ָ��ָ���ָ�룬�����ı�ָ���ַ��ֵ�������˫��ָ��
void Alarm_List_Node_PushBack(ALARM_NODE_T ** ppList,SYS_ALARM_VALVE_T alarm_id)
{
-// ALARM_NODE_T * tail, * now_ptr;
-//
-// if(alarm_id != ALARM_ID_NORMAL)
-// {
-// alarm_list_cnt++;
-// if(*ppList == NULL)
-// {
-// *ppList = Alarm_List_Node_Add(alarm_id);
-// }
-// else
-// {
-// //�ж��������Ƿ��Ѿ����ڸñ���id���Ѿ����ڲ��ٲ�������
-// do{
-// if(now_ptr->list_data == alarm_id){
-// return;
-// }else{
-// now_ptr = now_ptr->alarm_list_next;
-// }
-//
-// }while(now_ptr != NULL);
-//
-// tail = *ppList;
-// while(tail->alarm_list_next)
-// tail = tail->alarm_list_next;
-// tail->alarm_list_next = Alarm_List_Node_Add(alarm_id);
-// }
-// }
+ if(alarm_id != AV_NORMAL)
+ {
+ alarm_list_cnt++;
+ if(*ppList == NULL)
+ {
+ *ppList = Alarm_List_Node_Add(alarm_id);
+ }
+ else
+ {
+ ALARM_NODE_T * tail = *ppList;
+ while(tail->alarm_list_next)
+ tail = tail->alarm_list_next;
+ tail->alarm_list_next = Alarm_List_Node_Add(alarm_id);
+ }
+ }
}
//�������βɾ
void Alarm_List_Node_PopBack(ALARM_NODE_T ** ppList)
@@ -84,31 +72,31 @@
//�������м�ɾ��
void Alarm_List_Node_Deleted(ALARM_NODE_T ** ppHeadList,SYS_ALARM_VALVE_T alarm_id)
{
-// if(alarm_id != ALARM_ID_NORMAL)
-// {
-// ALARM_NODE_T * last_ptr,* now_ptr;
-// if(*ppHeadList == NULL)
-// return;
-// else
-// {
-// now_ptr = *ppHeadList;
-// while(now_ptr->alarm_list_next != NULL && now_ptr->list_data != alarm_id)
-// {
-// last_ptr = now_ptr;
-// now_ptr = now_ptr->alarm_list_next;
-// }
-// if(now_ptr->list_data == alarm_id)
-// {
-// alarm_list_cnt--;
-// if(now_ptr == *ppHeadList)
-// *ppHeadList = now_ptr->alarm_list_next;
-// else
-// last_ptr->alarm_list_next = now_ptr->alarm_list_next;
-// free(now_ptr);
-// now_ptr = NULL;
-// }
-// }
-// }
+ if(alarm_id != AV_NORMAL)
+ {
+ ALARM_NODE_T * last_ptr,* now_ptr;
+ if(*ppHeadList == NULL)
+ return;
+ else
+ {
+ now_ptr = *ppHeadList;
+ while(now_ptr->alarm_list_next != NULL && now_ptr->list_data != alarm_id)
+ {
+ last_ptr = now_ptr;
+ now_ptr = now_ptr->alarm_list_next;
+ }
+ if(now_ptr->list_data == alarm_id)
+ {
+ alarm_list_cnt--;
+ if(now_ptr == *ppHeadList)
+ *ppHeadList = now_ptr->alarm_list_next;
+ else
+ last_ptr->alarm_list_next = now_ptr->alarm_list_next;
+ free(now_ptr);
+ now_ptr = NULL;
+ }
+ }
+ }
}
--
Gitblit v1.9.3