mirror of
https://gitlab.com/klmp200/LO27.git
synced 2024-12-23 02:51:08 +00:00
Je suis débile
This commit is contained in:
commit
7aa0c34b91
@ -1,18 +1,33 @@
|
||||
<<<<<<< HEAD
|
||||
/*
|
||||
* @Author: klmp200
|
||||
* @Date: 2016-12-10 01:32:50
|
||||
* @Last Modified by: klmp200
|
||||
* @Last Modified time: 2016-12-10 21:08:25
|
||||
*/
|
||||
=======
|
||||
/***
|
||||
--- CellElemFunc ---
|
||||
---Created by : Naej Doree ---
|
||||
***/
|
||||
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <CellElement.h>
|
||||
|
||||
<<<<<<< HEAD
|
||||
cellElement * CreateCellElem(){
|
||||
cellElement * elem = NULL;
|
||||
elem = (cellElement*) malloc(sizeof(cellElement));
|
||||
|
||||
=======
|
||||
|
||||
cellElement * CreateCellElem(){
|
||||
cellElement * elem = NULL;
|
||||
elem = (cellElement*) malloc(sizeof(cellElement));
|
||||
|
||||
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
|
||||
if (elem == NULL){
|
||||
return NULL;
|
||||
}
|
||||
@ -23,8 +38,13 @@ cellElement * CreateCellElem(){
|
||||
elem->nextCol = NULL;
|
||||
elem->nextRow = NULL;
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
return elem;
|
||||
=======
|
||||
|
||||
return elem;
|
||||
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
|
||||
}
|
||||
|
||||
void freeCellElem(cellElement * elem){
|
||||
@ -36,7 +56,11 @@ int AddNextCol(cellElement* tree){
|
||||
|
||||
cellElement * elem = NULL;
|
||||
elem = (cellElement*) malloc(sizeof(cellElement));
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
|
||||
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
|
||||
if (elem == NULL){
|
||||
return -1;
|
||||
}
|
||||
@ -52,7 +76,11 @@ int AddNextCol(cellElement* tree){
|
||||
}else{
|
||||
return -2;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
|
||||
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -61,7 +89,11 @@ int AddNextRow(cellElement* tree){
|
||||
|
||||
cellElement * elem = NULL;
|
||||
elem = (cellElement*) malloc(sizeof(cellElement));
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
|
||||
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
|
||||
if (elem == NULL){
|
||||
return -1;
|
||||
}
|
||||
@ -87,7 +119,10 @@ void removeNextCol(cellElement* tree){
|
||||
free(elem);
|
||||
elem = NULL;
|
||||
tree->nextCol = NULL;
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
|
||||
}
|
||||
|
||||
}
|
||||
@ -100,7 +135,10 @@ void removeNextRow(cellElement* tree){
|
||||
free(elem);
|
||||
elem =NULL;
|
||||
tree->nextRow = NULL;
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 7e928547972ebd5897e1f416cb7a9a885479ed84
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -38,6 +38,7 @@ struct cellElement {
|
||||
|
||||
};
|
||||
typedef struct cellElement cellElement;
|
||||
<<<<<<< HEAD
|
||||
|
||||
cellElement * CreateCellElem();
|
||||
void freeCellElem(cellElement * elem);
|
||||
@ -48,6 +49,18 @@ int AddNextRow(cellElement* tree);
|
||||
void removeNextCol(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 FreeCellElement(cellElement* element);
|
||||
|
2
Makefile
2
Makefile
@ -25,7 +25,6 @@ DEPENDENCENAMELIST=List
|
||||
|
||||
|
||||
all: $(TARGET)
|
||||
|
||||
#Generating the main.exe
|
||||
$(TARGET): $(SOURCEOFILE) $(DEPENDENCELIST) lib
|
||||
@echo "\n Generating the " $(TARGET) " binary"
|
||||
@ -55,4 +54,3 @@ clean:
|
||||
rm -rf *.o ./Libs/*.so *.exe
|
||||
$(MAKE) -C LibCell clean
|
||||
$(MAKE) -C LibList clean
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user