diff --git a/Project2/Debug/Project2.exe.recipe b/Project2/Debug/Project2.exe.recipe index 8ecf20e..5058dca 100644 --- a/Project2/Debug/Project2.exe.recipe +++ b/Project2/Debug/Project2.exe.recipe @@ -2,7 +2,7 @@ - C:\Users\段宇宸\Documents\GitHub\Project2\Debug\Project2.exe + C:\code\lencode\Project2\Debug\Project2.exe diff --git a/Project2/Debug/Project2.log b/Project2/Debug/Project2.log index ce41d52..77f8b0b 100644 --- a/Project2/Debug/Project2.log +++ b/Project2/Debug/Project2.log @@ -1 +1,8 @@ - Project2.vcxproj -> C:\Users\段宇宸\Documents\GitHub\Project2\Debug\Project2.exe + sq_list.c +C:\code\lencode\Project2\sq_list.c(94,37): warning C4028: 形参 2 与声明不同 +C:\code\lencode\Project2\sq_list.c(100,9): warning C4033: “locate_list”必须返回值 +C:\code\lencode\Project2\sq_list.c(104,27): warning C4047: “==”:“int”与“int *”的间接级别不同 +C:\code\lencode\Project2\sq_list.c(110,9): warning C4033: “locate_list”必须返回值 +C:\code\lencode\Project2\sq_list.c(164,34): warning C4133: “函数”: 从“sq_list *”到“int *”的类型不兼容 +C:\code\lencode\Project2\sq_list.c(114,1): warning C4715: “locate_list”: 不是所有的控件路径都返回值 + Project2.vcxproj -> C:\code\lencode\Project2\Debug\Project2.exe diff --git a/Project2/Debug/Project2.tlog/CL.command.1.tlog b/Project2/Debug/Project2.tlog/CL.command.1.tlog index 53c914f..3dcb4bf 100644 Binary files a/Project2/Debug/Project2.tlog/CL.command.1.tlog and b/Project2/Debug/Project2.tlog/CL.command.1.tlog differ diff --git a/Project2/Debug/Project2.tlog/CL.read.1.tlog b/Project2/Debug/Project2.tlog/CL.read.1.tlog index c2df495..4726291 100644 Binary files a/Project2/Debug/Project2.tlog/CL.read.1.tlog and b/Project2/Debug/Project2.tlog/CL.read.1.tlog differ diff --git a/Project2/Debug/Project2.tlog/CL.write.1.tlog b/Project2/Debug/Project2.tlog/CL.write.1.tlog index 11f3298..5f7512d 100644 Binary files a/Project2/Debug/Project2.tlog/CL.write.1.tlog and b/Project2/Debug/Project2.tlog/CL.write.1.tlog differ diff --git a/Project2/Debug/Project2.tlog/Cl.items.tlog b/Project2/Debug/Project2.tlog/Cl.items.tlog index 900f0d6..f9da5c0 100644 --- a/Project2/Debug/Project2.tlog/Cl.items.tlog +++ b/Project2/Debug/Project2.tlog/Cl.items.tlog @@ -1,4 +1,4 @@ -C:\Users\段宇宸\Documents\GitHub\Project2\linked_list.c;C:\Users\段宇宸\Documents\GitHub\Project2\Project2\Debug\linked_list.obj -C:\Users\段宇宸\Documents\GitHub\Project2\linked_list_stack.c;C:\Users\段宇宸\Documents\GitHub\Project2\Project2\Debug\linked_list_stack.obj -C:\Users\段宇宸\Documents\GitHub\Project2\main.c;C:\Users\段宇宸\Documents\GitHub\Project2\Project2\Debug\main.obj -C:\Users\段宇宸\Documents\GitHub\Project2\sq_list.c;C:\Users\段宇宸\Documents\GitHub\Project2\Project2\Debug\sq_list.obj +C:\code\lencode\Project2\linked_list.c;C:\code\lencode\Project2\Project2\Debug\linked_list.obj +C:\code\lencode\Project2\linked_list_stack.c;C:\code\lencode\Project2\Project2\Debug\linked_list_stack.obj +C:\code\lencode\Project2\main.c;C:\code\lencode\Project2\Project2\Debug\main.obj +C:\code\lencode\Project2\sq_list.c;C:\code\lencode\Project2\Project2\Debug\sq_list.obj diff --git a/Project2/Debug/Project2.tlog/Project2.lastbuildstate b/Project2/Debug/Project2.tlog/Project2.lastbuildstate index c601493..9743022 100644 --- a/Project2/Debug/Project2.tlog/Project2.lastbuildstate +++ b/Project2/Debug/Project2.tlog/Project2.lastbuildstate @@ -1,2 +1,2 @@ -PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.43.34808:TargetPlatformVersion=10.0.22621.0: -Debug|Win32|C:\Users\段宇宸\Documents\GitHub\Project2\| +PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.43.34808:TargetPlatformVersion=10.0.26100.0: +Debug|Win32|C:\code\lencode\Project2\| diff --git a/Project2/Debug/Project2.tlog/link.read.1.tlog b/Project2/Debug/Project2.tlog/link.read.1.tlog index a41af58..4b35156 100644 Binary files a/Project2/Debug/Project2.tlog/link.read.1.tlog and b/Project2/Debug/Project2.tlog/link.read.1.tlog differ diff --git a/Project2/Debug/Project2.tlog/link.secondary.1.tlog b/Project2/Debug/Project2.tlog/link.secondary.1.tlog index a91ecb3..578ed71 100644 --- a/Project2/Debug/Project2.tlog/link.secondary.1.tlog +++ b/Project2/Debug/Project2.tlog/link.secondary.1.tlog @@ -1,2 +1,2 @@ -^C:\USERS\段宇宸\DOCUMENTS\GITHUB\PROJECT2\PROJECT2\DEBUG\LINKED_LIST.OBJ|C:\USERS\段宇宸\DOCUMENTS\GITHUB\PROJECT2\PROJECT2\DEBUG\LINKED_LIST_STACK.OBJ|C:\USERS\段宇宸\DOCUMENTS\GITHUB\PROJECT2\PROJECT2\DEBUG\MAIN.OBJ|C:\USERS\段宇宸\DOCUMENTS\GITHUB\PROJECT2\PROJECT2\DEBUG\SQ_LIST.OBJ -C:\Users\段宇宸\Documents\GitHub\Project2\Project2\Debug\Project2.ilk +^C:\CODE\LENCODE\PROJECT2\PROJECT2\DEBUG\LINKED_LIST.OBJ|C:\CODE\LENCODE\PROJECT2\PROJECT2\DEBUG\LINKED_LIST_STACK.OBJ|C:\CODE\LENCODE\PROJECT2\PROJECT2\DEBUG\MAIN.OBJ|C:\CODE\LENCODE\PROJECT2\PROJECT2\DEBUG\SQ_LIST.OBJ +C:\code\lencode\Project2\Project2\Debug\Project2.ilk diff --git a/Project2/Debug/Project2.tlog/link.write.1.tlog b/Project2/Debug/Project2.tlog/link.write.1.tlog index 4a65130..67bcf27 100644 Binary files a/Project2/Debug/Project2.tlog/link.write.1.tlog and b/Project2/Debug/Project2.tlog/link.write.1.tlog differ diff --git a/sq_list.c b/sq_list.c index 275078a..ef00d8d 100644 --- a/sq_list.c +++ b/sq_list.c @@ -63,7 +63,7 @@ void insert_sq_list(sq_list* list, int pos, int value) list->data[i + 1] = list->data[i]; } list->data[pos] = value; - if (flog + 1 > list->length) + /* if (flog + 1 > list->length)*/ list->length++; } @@ -158,18 +158,11 @@ void mer_ge_sq_list(sq_list* list_1, sq_list* list_2) { int e; int k = 0; - for (int k=0;k < list_2->length;k++); + for (int k=0;k < list_2->length;k++) { - get_sq_list(list_2,k,&e); - if(!locate_list(list_1,list_2)) - insert_sq_list(list_1,list_1->length, e); - - - - + get_sq_list(list_2, k, &e); + if (!locate_list(list_1, list_2)) + insert_sq_list(list_1, list_1->length, e); } - - - }