glenux-school/l3.libnazgul
glenux-school/l3.libnazgul
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

qqes modifs

Browse source
This commit is contained in:
stormrider1982 2004-02-23 22:34:28 +00:00 committed by Glenn Y. Rolland
parent 97b36b686f
commit 776800c730
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/queueAdd.c
View file

@ -19,6 +19,12 @@ int msgQueueElemAdd(msgQueue * queue, msgQueueElemId newElemId){
} }
/* TODO: verifier si la liste n'est pas vide... */ /* TODO: verifier si la liste n'est pas vide... */
if(queue->elemCounter < 1) {
NZG_ERROR("msgQueueAdd",queue->id);
goto ERROR;
}
/* on informe son prédecesseur qu'il a un suivant */ /* on informe son prédecesseur qu'il a un suivant */
queueOldTailElem=msgQueueElemOpen(queue->tailId); queueOldTailElem=msgQueueElemOpen(queue->tailId);
if (queueOldTailElem == NULL){ if (queueOldTailElem == NULL){
@ -33,6 +39,9 @@ int msgQueueElemAdd(msgQueue * queue, msgQueueElemId newElemId){
// on donne a la queue l'id du dernier element // on donne a la queue l'id du dernier element
strcpy(queue->tailId,newElemId); strcpy(queue->tailId,newElemId);
// on incremente elemCounter
queue->elemCounter++;
ERROR: ERROR:
return -1; return -1;
} }

4
src/queueDelete.c
View file

@ -4,6 +4,7 @@ int msgQueueElemDelete(msgQueueElemId queueElemId){
msgQueueElem * queueElemAddr; msgQueueElem * queueElemAddr;
msgQueueElemId nextIdToDie; msgQueueElemId nextIdToDie;
queueElemAddr = msgQueueElemOpen(queueElemId); queueElemAddr = msgQueueElemOpen(queueElemId);
strcpy(nextIdToDie,queueElemAddr->id); strcpy(nextIdToDie,queueElemAddr->id);
msgQueueElemClose(queueElemAddr); msgQueueElemClose(queueElemAddr);
@ -13,12 +14,13 @@ int msgQueueElemDelete(msgQueueElemId queueElemId){
goto ERROR; goto ERROR;
} }
if (nextIdToDie != NULL){ if (nextIdToDie != queueElemId){
return msgQueueElemDelete(nextIdToDie); return msgQueueElemDelete(nextIdToDie);
} else { } else {
return 0; return 0;
} }
ERROR: ERROR:
return -1; return -1;
} }