klmp200/LO27
1
0
Fork 0
mirror of https://gitlab.com/klmp200/LO27.git synced 2024-11-26 18:04:14 +00:00
Code Issues Releases Wiki Activity

Je suis débile

Browse Source
This commit is contained in:
Antoine Bartuccio 2016-12-10 21:13:26 +01:00
commit 7aa0c34b91
4 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
LibList/CellElement.c
View File

@ -1,18 +1,33 @@
<<<<<<< HEAD
/* /*
* @Author: klmp200 * @Author: klmp200
* @Date: 2016-12-10 01:32:50 * @Date: 2016-12-10 01:32:50
* @Last Modified by: klmp200 * @Last Modified by: klmp200
* @Last Modified time: 2016-12-10 21:08:25 * @Last Modified time: 2016-12-10 21:08:25
*/ */
=======
/***
--- CellElemFunc ---
---Created by : Naej Doree ---
***/
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <CellElement.h> #include <CellElement.h>
<<<<<<< HEAD
cellElement * CreateCellElem(){ cellElement * CreateCellElem(){
cellElement * elem = NULL; cellElement * elem = NULL;
elem = (cellElement*) malloc(sizeof(cellElement)); elem = (cellElement*) malloc(sizeof(cellElement));
=======
cellElement * CreateCellElem(){
cellElement * elem = NULL;
elem = (cellElement*) malloc(sizeof(cellElement));
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
if (elem == NULL){ if (elem == NULL){
return NULL; return NULL;
} }
@ -23,8 +38,13 @@ cellElement * CreateCellElem(){
elem->nextCol = NULL; elem->nextCol = NULL;
elem->nextRow = NULL; elem->nextRow = NULL;
<<<<<<< HEAD
return elem; return elem;
=======
return elem;
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
} }
void freeCellElem(cellElement * elem){ void freeCellElem(cellElement * elem){
@ -36,7 +56,11 @@ int AddNextCol(cellElement* tree){
cellElement * elem = NULL; cellElement * elem = NULL;
elem = (cellElement*) malloc(sizeof(cellElement)); elem = (cellElement*) malloc(sizeof(cellElement));
<<<<<<< HEAD
=======
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
if (elem == NULL){ if (elem == NULL){
return -1; return -1;
} }
@ -52,7 +76,11 @@ int AddNextCol(cellElement* tree){
}else{ }else{
return -2; return -2;
} }
<<<<<<< HEAD
=======
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
return 1; return 1;
} }
@ -61,7 +89,11 @@ int AddNextRow(cellElement* tree){
cellElement * elem = NULL; cellElement * elem = NULL;
elem = (cellElement*) malloc(sizeof(cellElement)); elem = (cellElement*) malloc(sizeof(cellElement));
<<<<<<< HEAD
=======
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
if (elem == NULL){ if (elem == NULL){
return -1; return -1;
} }
@ -87,7 +119,10 @@ void removeNextCol(cellElement* tree){
free(elem); free(elem);
elem = NULL; elem = NULL;
tree->nextCol = NULL; tree->nextCol = NULL;
<<<<<<< HEAD
=======
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
} }
} }
@ -100,7 +135,10 @@ void removeNextRow(cellElement* tree){
free(elem); free(elem);
elem =NULL; elem =NULL;
tree->nextRow = NULL; tree->nextRow = NULL;
<<<<<<< HEAD
=======
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
} }
} }

13
LibList/CellElement.h
View File

@ -38,6 +38,7 @@ struct cellElement {
}; };
typedef struct cellElement cellElement; typedef struct cellElement cellElement;
<<<<<<< HEAD
cellElement * CreateCellElem(); cellElement * CreateCellElem();
void freeCellElem(cellElement * elem); void freeCellElem(cellElement * elem);
@ -48,6 +49,18 @@ int AddNextRow(cellElement* tree);
void removeNextCol(cellElement* list); void removeNextCol(cellElement* list);
void removeNextRow(cellElement* list); void removeNextRow(cellElement* list);
=======
cellElement * CreateCellElem();
void freeCellElem(cellElement * elem);
int AddNextCol(cellElement* tree);
int AddNextRow(cellElement* tree);
void removeNextCol(cellElement* list);
void removeNextRow(cellElement* list);
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
void recursivePrint(cellElement * tree); void recursivePrint(cellElement * tree);
void FreeCellElement(cellElement* element); void FreeCellElement(cellElement* element);

2
Makefile
View File

@ -25,7 +25,6 @@ DEPENDENCENAMELIST=List
all: $(TARGET) all: $(TARGET)
#Generating the main.exe #Generating the main.exe
$(TARGET): $(SOURCEOFILE) $(DEPENDENCELIST) lib $(TARGET): $(SOURCEOFILE) $(DEPENDENCELIST) lib
@echo "\n Generating the " $(TARGET) " binary" @echo "\n Generating the " $(TARGET) " binary"
@ -55,4 +54,3 @@ clean:
rm -rf *.o ./Libs/*.so *.exe rm -rf *.o ./Libs/*.so *.exe
$(MAKE) -C LibCell clean $(MAKE) -C LibCell clean
$(MAKE) -C LibList clean $(MAKE) -C LibList clean

2
main.c
View File

@ -8,7 +8,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <CellElement.h>
#include <List.h> #include <List.h>
int main(int argc, char **argv){ int main(int argc, char **argv){