s/delete/free/g

This commit is contained in:
Murilo Pereira
2011-02-14 00:10:47 -02:00
parent e59d089b45
commit 417a8ca2b7
13 changed files with 48 additions and 48 deletions

View File

@@ -25,9 +25,9 @@ void initialize_card(struct card *card) {
return;
}
void delete_card(struct card *card) {
void free_card(struct card *card) {
if (card) {
delete_frame(card->frame);
free_frame(card->frame);
}
free(card);

View File

@@ -45,7 +45,7 @@ extern const char *program_name;
void allocate_card(struct card **);
void initialize_card(struct card *);
void delete_card(struct card *);
void free_card(struct card *);
void set_card(struct card *, enum value, enum suit, enum face, int, int);
void expose_card(struct card *);
void cover_card(struct card *);

View File

@@ -50,22 +50,22 @@ void initialize_deck(struct deck *deck) {
return;
}
void delete_deck(struct deck *deck) {
void free_deck(struct deck *deck) {
if (deck) {
delete_stack(deck->waste_pile);
free_stack(deck->waste_pile);
delete_stack(deck->foundation_0);
delete_stack(deck->foundation_1);
delete_stack(deck->foundation_2);
delete_stack(deck->foundation_3);
free_stack(deck->foundation_0);
free_stack(deck->foundation_1);
free_stack(deck->foundation_2);
free_stack(deck->foundation_3);
delete_stack(deck->maneuvre_0);
delete_stack(deck->maneuvre_1);
delete_stack(deck->maneuvre_2);
delete_stack(deck->maneuvre_3);
delete_stack(deck->maneuvre_4);
delete_stack(deck->maneuvre_5);
delete_stack(deck->maneuvre_6);
free_stack(deck->maneuvre_0);
free_stack(deck->maneuvre_1);
free_stack(deck->maneuvre_2);
free_stack(deck->maneuvre_3);
free_stack(deck->maneuvre_4);
free_stack(deck->maneuvre_5);
free_stack(deck->maneuvre_6);
}
free(deck);

View File

@@ -41,6 +41,6 @@ extern const char *program_name;
void allocate_deck(struct deck **);
void initialize_deck(struct deck *);
void delete_deck(struct deck *);
void free_deck(struct deck *);
#endif

View File

@@ -22,7 +22,7 @@ void initialize_frame(struct frame *frame) {
return;
}
void delete_frame(struct frame *frame) {
void free_frame(struct frame *frame) {
if (frame) {
delwin(frame->shape);
}

View File

@@ -16,7 +16,7 @@ extern const char *program_name;
void allocate_frame(struct frame **);
void initialize_frame(struct frame *);
void delete_frame(struct frame *);
void free_frame(struct frame *);
void set_frame(struct frame *, int, int);
#endif

View File

@@ -224,7 +224,7 @@ void initialize_game() {
}
void end_game() {
delete_deck(deck);
free_deck(deck);
return;
}

View File

@@ -28,12 +28,12 @@ void initialize_stack(struct stack *stack) {
return;
}
void delete_stack(struct stack *stack) {
void free_stack(struct stack *stack) {
struct stack *tmp_stack;
while (stack) {
tmp_stack = stack->next;
delete_card(stack->card);
free_card(stack->card);
free(stack);
stack = tmp_stack;
}

View File

@@ -35,7 +35,7 @@ extern const char *program_name;
void allocate_stack(struct stack **);
void initialize_stack(struct stack *);
void delete_stack(struct stack *);
void free_stack(struct stack *);
bool empty(struct stack *);
int length(struct stack *);
void push(struct stack **, struct card *);