From 4970551be4c824dea724466199a9e10c1539137a Mon Sep 17 00:00:00 2001 From: Lola CHALMIN Date: Tue, 13 Dec 2022 16:45:51 +0100 Subject: [PATCH] une version qui marche pour sur --- commun.c | 13 +++++-------- commun.h | 1 + test | Bin 0 -> 16984 bytes testcommun.c | 3 +++ 4 files changed, 9 insertions(+), 8 deletions(-) create mode 100755 test diff --git a/commun.c b/commun.c index 1e9cd39..433fc7f 100644 --- a/commun.c +++ b/commun.c @@ -8,7 +8,7 @@ Choix lirechx (void){ Choix chx; - printf("Saisir le choix de la ville\n"); + printf("Saisir le choix de la ville \n"); fgets(chx.ville, 20, stdin); chx.ville[strlen(chx.ville)-1]= '\0'; @@ -42,7 +42,7 @@ Candidat lireCandidat(void)//fonction qui lit un candidat sur le clavier { Candidat c; printf("Numéro de candidat :\n"); - scanf("%d", &c.nEtu); + scanf("%d%*c", &c.nEtu); printf("Nom du candidat :\n"); fgets(c.nom, 20, stdin); printf("Prénom du candidat :\n"); @@ -56,12 +56,10 @@ Candidat lireCandidat(void)//fonction qui lit un candidat sur le clavier printf("Moyenne de spécialité au choix :\n"); scanf("%f", &c.moyspe); printf("Nombre de choix :\n"); - scanf("%d", &c.nbchx); - scanf("%d", nbchx); + scanf("%d%*c", &c.nbchx); return c; } -<<<<<<< HEAD @@ -88,15 +86,15 @@ Candidat lireCandidat(void)//fonction qui lit un candidat sur le clavier +/* Choix * chargeChoix(Choix *tchoix, TAILLE, nbchx){ } +*/ - -======= void AffC(Candidat c) { printf("%d\n", c.nEtu); @@ -104,4 +102,3 @@ void AffC(Candidat c) printf("%.2f\t%.2f\t%.2f\t%.2f\n", c.moymat,c.moyfr, c.moyen, c.moyspe); printf("%d\n", c.nbchx); } ->>>>>>> refs/remotes/origin/master diff --git a/commun.h b/commun.h index ab96e66..f1aa062 100644 --- a/commun.h +++ b/commun.h @@ -36,6 +36,7 @@ typedef struct { Candidat lireCandidat(void); Choix lirechx (void); +void AffC(Candidat c); diff --git a/test b/test new file mode 100755 index 0000000000000000000000000000000000000000..7ef8ad36ac4226650b5d856ba24ab65c5938a4fd GIT binary patch literal 16984 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