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

*** empty log message ***

Browse source
This commit is contained in:
glenux 2004-02-25 23:49:39 +00:00 committed by Glenn Y. Rolland
parent 0d75ebe2e9
commit 546086f5f9
2 changed files with 73 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/spaceCreate.c
View file

@ -55,13 +55,13 @@ msgSpace * msgSpaceCreate(
int err; int err;
if ((err=msgSpaceListFindId(nzgId)) < 1){ if ((err=msgSpaceListFindId(nzgId)) < 1){
if (err==0){ if (err==0){
// soit le msgSpace existe deja
NZG_ERROR("spaceListFindId : existing ",nzgId); NZG_ERROR("spaceListFindId : existing ",nzgId);
} else { } else {
// zut, il y a soit une erreur
NZG_ERROR("spaceListFindId : error ",nzgId); NZG_ERROR("spaceListFindId : error ",nzgId);
} }
msgSpaceListUnlock(); msgSpaceListUnlock();
// zut, il y a soit une erreur
// soit le msgSpace existe deja
// on quitte // on quitte
goto ERROR; goto ERROR;
} }
@ -121,7 +121,7 @@ msgSpace * msgSpaceCreate(
space->poolDataTabSemId); space->poolDataTabSemId);
goto ERROR; goto ERROR;
} else { } else {
/* NZG_ERROR("sem_open : creation oki", /* NZG_ERROR("sem_open : creation oki",
space->poolDataTabSemId); */ space->poolDataTabSemId); */
} }
sem_close(mSDataTabSemFd); sem_close(mSDataTabSemFd);

86
src/spaceListRem.c
View file

@ -1,41 +1,83 @@
#include "libnazgul.h" #include "libnazgul.h"
int msgSpaceListRem(msgSpaceListElemId oldElemId){ #define DEBUG 1
msgSpaceListElem * listOldHeadElem;
msgSpaceList * list=NULL;
int msgSpaceListRem(msgSpaceId spaceId){
msgSpaceList * list;
msgSpaceListElemId listHeadElemId;
msgSpaceListElemId listTailElemId;
msgSpaceListId listId;
list=msgSpaceListOpen(); list=msgSpaceListOpen();
if (list==NULL){
NZG_ERROR("msgSpaceListOpen","");
if (strcmp(list->headId,list->id)==0){
NZG_ERROR("msgSpaceListElemRem : Empty list",list->id);
goto ERROR; goto ERROR;
} }
strcpy(oldElemId,list->headId); if (DEBUG) { printf("Before ListStrCpy\n"); }
strcpy(listHeadElemId,list->headId);
listOldHeadElem=msgSpaceListElemOpen(oldElemId); strcpy(listTailElemId,list->tailId);
if (listOldHeadElem == NULL){ strcpy(listId,list->id);
NZG_ERROR("msgSpaceListElemOpen",oldElemId); if (DEBUG) { printf("After ListStrCpy\n"); }
if (msgSpaceListClose(list) < 0){
NZG_ERROR("msgSpaceListClose","");
goto ERROR; goto ERROR;
} }
if ((strcmp(listHeadElemId,listId)==0)
&& strcmp(listTailElemId,listId)==0){
if (DEBUG) { printf("SpaceList : vide\n"); }
return 1;
} else {
printf("RechercheRem dans l'element %s\n",listHeadElemId);
return msgSpaceListElemRem(listHeadElemId,spaceId);
}
ERROR:
return -1;
}
// on indique ŕ la list le nouveau premier element int msgSpaceListElemRem(msgSpaceListElemId elemId,msgSpaceId spaceId){
strcpy(list->headId,listOldHeadElem->next); msgSpaceListElem * listElem;
// on fait en sorte que l'element ne connaisse plus msgSpaceListElemId listElemIdNext;
// ses voisins (utile pour le Delete) msgSpaceId currentElemSpaceId;
strcpy(listOldHeadElem->next,listOldHeadElem->id);
if (msgSpaceListElemClose(listOldHeadElem)<0 ){ listElem=msgSpaceListElemOpen(elemId);
NZG_ERROR("msgSpaceListElemClose",oldElemId); if (listElem==NULL){
NZG_ERROR("msgSpaceListElemOpen",elemId);
goto ERROR; goto ERROR;
}
strcpy(listElemIdNext,listElem->next);
strcpy(currentElemSpaceId,listElem->spaceId);
printf("Current ListElem: Next:%s, Sid:%s\n",
listElemIdNext,currentElemSpaceId);
if (msgSpaceListElemClose(listElem) <0){
NZG_ERROR("msgSpaceListElemClose",elemId);
goto ERROR;
}
printf("comparisons...\n");
if (strcmp(listElemIdNext,elemId)==0){
//on a rien trouvé avant et on est au bout
return -1;
} else {
msgSpaceListElem * listElemNext;
msgSpaceListElemId spaceIdNext;
listElemNext=msgSpaceListElemOpen(listElemIdNext);
strcpy(spaceIdNext,listElemNext->spaceId);
strcpy(listElemIdNextNext,listElemNext->next);
msgSpaceListElemClose(listElemNext);
if (strcmp(spaceIdNext,spaceId)==0) {
printf("Found/Rem %s in spaceList !\n",spaceId);
// l'element suivant correspond
// on ouvre l'elem courant
// si l'id(nextnext) == id(next) alors on met notre propre id
// sinon on met notre propre id dans next
// on unlinke l'ancien suivant
return 0;
} else {
return msgSpaceListElemRem(listElemIdNext,spaceId);
} }
msgSpaceListClose(list); }
return 0; return 0;
ERROR: ERROR:
return -1; return -1;
} }