diff --git a/.DS_Store b/.DS_Store index b6510ba..f6a6b61 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/input.c b/input.c index 91cb3e3..452cf6c 100644 --- a/input.c +++ b/input.c @@ -1,33 +1,49 @@ #include "mysyslib.h" +void Print(Student*student){ + printf("%s,%s,%s,%.1lf,%.1lf,%.1lf,%.1lf\n",&student->id,&student->class,&student->name,student->score1,student->score2,student->score3,student->score); +} + +void allPrint(ss*stu){ + for(int i = 0; i < stu->nums; ++i){ + Print(&stu->student[i]); + } +} + void input(ss*stu){ - char *tmp = (char*)malloc(sizeof(char)*3); + char tmp[3]; do{ + int pst = stu->nums; printf("Id "); - // get + scanf("%s",&stu->student[pst].id); printf("\n"); - + printf("class "); - // get + scanf("%s",&stu->student[pst].class); printf("\n"); - + printf("name "); - // get + scanf("%s",&stu->student[pst].name); printf("\n"); - + printf("score1 "); - // get + scanf("%lf",&stu->student[pst].score1); printf("\n"); - + printf("score2 "); - // get + scanf("%lf",&stu->student[pst].score2); printf("\n"); - + printf("score3 "); - // get + scanf("%lf",&stu->student[pst].score3); printf("\n"); - + + stu->student[pst].score = stu->student[pst].score1 + stu->student[pst].score2 + stu->student[pst].score3; + stu->nums++; + printf("continue?\n"); scanf("%s",tmp); - }while(strcmp(tmp,"yes")); + }while(!strcmp(&tmp,"yes")); + + return; }