pgp/Traitement-signal-plantes
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge real

Browse source
This commit is contained in:
Aurélien Gauthier 2022-06-10 17:21:16 +02:00
parent 012de80d21
commit 925c42ba2c
1 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Code-C/queue.c
View file

@ -23,11 +23,7 @@ typedef struct queue *Pqueue;
* *
* @return Pqueue * @return Pqueue
*/ */
<<<<<<< HEAD
Pqueue queueCreateEmpty(){ Pqueue queueCreateEmpty(){
=======
Pqueue createE(int lenChar){
>>>>>>> 2e7253c43c8e65a98686582d853147831016103f
Pqueue new = (Pqueue) malloc(sizeof(struct queue)); Pqueue new = (Pqueue) malloc(sizeof(struct queue));
assert(new); assert(new);
new->charLen = 0; new->charLen = 0;
@ -103,7 +99,6 @@ char * queueGetTabChar(Pqueue elem){
return elem->tabChar; return elem->tabChar;
} }
<<<<<<< HEAD
/************ ************/ /************ ************/
/** /**
@ -118,18 +113,6 @@ Pqueue queueCreateE(int lenChar, const char* _tabChar){
queueSetTabChar(new, lenChar, _tabChar); queueSetTabChar(new, lenChar, _tabChar);
new->pNextE = NULL; new->pNextE = NULL;
return new; return new;
=======
void setCharLen(Pqueue elem , int _charLen){
assert(elem);
elem->charLen = _charLen;
}
void setTabChar(Pqueue elem , int _charLen , char *_tabChar){
assert(elem);
elem->charLen = _charLen;
elem->tabChar = (char *) malloc(_charLen * sizeof(char));
elem->tabChar = _tabChar;
>>>>>>> 2e7253c43c8e65a98686582d853147831016103f
} }
void setNextE(Pqueue elem , Pqueue next){ void setNextE(Pqueue elem , Pqueue next){
@ -200,18 +183,10 @@ Pqueue queueAddLastQ(Pqueue elem, const char* str, int len){
previous = tmp; previous = tmp;
tmp = queueGetNextE(tmp); tmp = queueGetNextE(tmp);
} }
<<<<<<< HEAD
tmp = queueCreateE(len); tmp = queueCreateE(len);
tmp->tabChar = str; tmp->tabChar = str;
tmp->charLen = len; tmp->charLen = len;
return tmp; return tmp;
=======
tmp -> pNextE = createE(len);
Pqueue next = getNextE(tmp);
next->tabChar = str;
next->charLen = len;
return next;
>>>>>>> 2e7253c43c8e65a98686582d853147831016103f
} }
/** /**