pipe-game

git clone git://bebou.netlib.re/pipe-game
Log | Files | Refs | README |

commit d426fc65d734e86b3e9f97d4158868a4a6a33f0e
parent 5877acfbcbc74bbc34e513cdd0fddcad9bfa1dc7
Auteurice: Arthur Pons <arthur.pons@unistra.fr>
Date:   Thu, 23 Jan 2025 14:39:39 +0100

str="blabla" -> strcmp(str,"blabla")==0

Y'avait plusieurs endroits où ça ne posait pas problème mais le
compitaleur C par défaut sur openbsd (clang je crois) met pleins de
warning.
J'essaye d'être bon élève alors je corrige

Diffstat:
M
interface.c
 | 
24
++++++++++++------------

1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/interface.c b/interface.c
@@ -54,8 +54,8 @@ bool addcardtopile(char* cardname, pile* p, pile **piles) {
 	/* strchr ne fonctionne pas avec utf-8 mais pour le moment rien
 	 * ne fonctionne en utf8 alors bon */
 	if(cardname[0]=='\0' || strchr(cardname,' ')!=NULL) return false;
-	if(p->name=="played") addcardtopile("none",piles[PLAYEDARGS],piles);
-	if(p->name=="playedargs" && strcmp(cardname,"none")!=0)
+	if(strcmp(p->name,"played")==0) addcardtopile("none",piles[PLAYEDARGS],piles);
+	if(strcmp(p->name,"playedargs")==0 && strcmp(cardname,"none")!=0)
 		p->cards[p->cardCount-1]=cardname;
 	else {
 		p->cards[p->cardCount] = malloc(CARD_NAME_SIZE);
@@ -67,11 +67,11 @@ bool addcardtopile(char* cardname, pile* p, pile **piles) {
 }
 
 void removecardofpile(int cardposition, pile* p, pile **piles) {
-	if(p->name=="played") {
+	if(strcmp(p->name,"played")==0) {
 		if(strcmp(piles[PLAYEDARGS]->cards[cardposition],"none")!=0)
 			addcardtopile(piles[PLAYEDARGS]->cards[cardposition],piles[ARGS],piles);
 		removecardofpile(cardposition,piles[PLAYEDARGS],piles);
-	} else if(p->name=="playedargs" && strcmp(p->cards[cardposition],"none")!=0) {
+	} else if(strcmp(p->name,"playedargs")==0 && strcmp(p->cards[cardposition],"none")!=0) {
 		p->cards[cardposition]="none";
 		return;
 	}
@@ -83,7 +83,7 @@ void removecardofpile(int cardposition, pile* p, pile **piles) {
 }
 
 pile* moveselection(pile* p, pile** piles, char* direction, bool selection) {
-	int step = direction == "up" ? -1 : 1 ;
+	int step = strcmp(direction,"up")==0 ? -1 : 1 ;
 	if (p->curline+step >= 0 && p->curline+step < p->cardCount) {
 		if (selection) {
 			char* tmp;
@@ -94,9 +94,9 @@ pile* moveselection(pile* p, pile** piles, char* direction, bool selection) {
 		p->curline=p->curline+step;
 		return p;
 	}
-	if (p->name=="hand" && direction == "down" && piles[ARGS]->cardCount>0)
+	if (strcmp(p->name,"hand")==0 && strcmp(direction,"down")==0 && piles[ARGS]->cardCount>0)
 		return piles[ARGS];
-	else if (p->name=="args" && direction == "up" && piles[HAND]->cardCount>0)
+	else if (strcmp(p->name,"args")==0 && strcmp(direction,"up")==0 && piles[HAND]->cardCount>0)
 		return piles[HAND];
 	return p;
 }
@@ -253,14 +253,14 @@ int main(int argc, char **argv) {
 						break;
 					/* <- */
 					case 65515:
-						if (curmenu->name=="played") {
+						if (strcmp(curmenu->name,"played")==0) {
 							if (selection) {
 								addcardtopile(played.cards[played.curline],&hand,piles);
 								removecardofpile(played.curline,&played,piles);
 								selection=!selection;
 							}
 							if (piles[HAND]->cardCount > 0){ curmenu=&hand; }
-						} else if (curmenu->name=="playedargs") {
+						} else if (strcmp(curmenu->name,"playedargs")==0) {
 							if (selection && strcmp(curmenu->cards[curmenu->curline],"none")!=0) {
 								addcardtopile(playedargs.cards[playedargs.curline],&args,piles);
 								removecardofpile(playedargs.curline,&playedargs,piles);
@@ -273,19 +273,19 @@ int main(int argc, char **argv) {
 						break;
 					/* -> */
 					case 65514:
-						if (curmenu->name=="hand") {
+						if (strcmp(curmenu->name,"hand")==0) {
 							if (selection) {
 								addcardtopile(hand.cards[hand.curline],&played,piles);
 								removecardofpile(hand.curline,&hand,piles);
 							}
 							if (piles[PLAYED]->cardCount > 0){ curmenu=&played; }
-						} else if (curmenu->name=="args") {
+						} else if (strcmp(curmenu->name,"args")==0) {
 							if (selection) {
 								addcardtopile(args.cards[args.curline],&playedargs,piles);
 								removecardofpile(args.curline,&args,piles);
 							}
 							if (piles[PLAYEDARGS]->cardCount > 0){ curmenu=&playedargs; }
-						} else if (curmenu->name=="played" && piles[PLAYEDARGS]->cardCount > 0) {
+						} else if (strcmp(curmenu->name,"played")==0 && piles[PLAYEDARGS]->cardCount > 0) {
 							curmenu=&playedargs;
 						}
 						break;