diff --git a/Project2/Debug/Project2.log b/Project2/Debug/Project2.log index 976bffc..259d036 100644 --- a/Project2/Debug/Project2.log +++ b/Project2/Debug/Project2.log @@ -1,2 +1,2 @@ - sq_list.c + main.c 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 63d0292..5c9a976 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 161a884..0ee1b32 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 cd2bbd5..5e17f11 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/main.c b/main.c index ae7d234..856879f 100644 --- a/main.c +++ b/main.c @@ -22,10 +22,10 @@ int main(void) L->length = 10; print_sq_list(N); print_sq_list(L); - printf("----------------------------------"); merge_sq_list(N,L); print_sq_list(L); - printf("%d", L->length); + printf("L->length:[%d]\n", L->length); printf("Hello World!\n"); + system("pause"); return 0; } diff --git a/sq_list.c b/sq_list.c index 658c42f..a4ac840 100644 --- a/sq_list.c +++ b/sq_list.c @@ -72,8 +72,10 @@ void insert_sq_list(sq_list* list, int pos, int value) // ´òÓ¡ void print_sq_list(sq_list* list) { + printf("["); for (int i = 0; i < list->length; i++) printf("%d ", list->data[i]); + printf("]"); printf("\n"); } @@ -107,7 +109,9 @@ void merge_sq_list(sq_list* list_1, sq_list* list_2) } } + printf("----------------------------------\n"); printf("ÓÐ%dÏàͬ ÓÐ%d²»Ïàͬ\n", flog, list_2->length - flog); + printf("----------------------------------\n"); } //if (list_1->data[j] != list_2->data[i])