Thu, 15 Sep 2011 13:38:03 +0200
Merge with 1dd63a32ffc486b71399045cf8443ec6ac9d7bf5
cline.c | file | annotate | diff | comparison | revisions | |
cline.h | file | annotate | diff | comparison | revisions | |
settings.c | file | annotate | diff | comparison | revisions | |
suffix_list.c | file | annotate | diff | comparison | revisions | |
suffix_list.h | file | annotate | diff | comparison | revisions |
1.1 --- a/settings.c Thu Sep 15 13:29:06 2011 +0200 1.2 +++ b/settings.c Thu Sep 15 13:38:03 2011 +0200 1.3 @@ -8,7 +8,7 @@ 1.4 #include "settings.h" 1.5 1.6 settings_t* new_settings_t() { 1.7 - settings_t *settings = malloc(sizeof(settings_t*)); 1.8 + settings_t *settings = malloc(sizeof(settings_t)); 1.9 if (settings != NULL) { 1.10 #ifdef _WIN32 1.11 settings->fileSeparator = '\\'; 1.12 @@ -25,6 +25,6 @@ 1.13 } 1.14 1.15 void destroy_settings_t(settings_t* settings) { 1.16 - destroy_suffix_list_t(settings->suffixList); 1.17 + free(settings->suffixList); 1.18 free(settings); 1.19 }
2.1 --- a/suffix_list.c Thu Sep 15 13:29:06 2011 +0200 2.2 +++ b/suffix_list.c Thu Sep 15 13:38:03 2011 +0200 2.3 @@ -8,23 +8,16 @@ 2.4 #include "suffix_list.h" 2.5 2.6 suffix_list_t* new_suffix_list_t() { 2.7 - suffix_list_t* suffixList = malloc(sizeof(suffix_list_t*)); 2.8 + suffix_list_t* suffixList = malloc(sizeof(suffix_list_t)); 2.9 suffixList->count = 0; 2.10 suffixList->items = NULL; 2.11 2.12 return suffixList; 2.13 } 2.14 2.15 -void destroy_suffix_list_t(suffix_list_t* list) { 2.16 - while (--list->count >= 0) { 2.17 - free(list->items[list->count]); 2.18 - } 2.19 - free(list); 2.20 -} 2.21 - 2.22 void add_suffix(suffix_list_t* list, char* item) { 2.23 char** reallocated_list = 2.24 - realloc(list->items, sizeof(char**) * list->count + 1); 2.25 + realloc(list->items, sizeof(char*) * list->count + 1); 2.26 if (reallocated_list != NULL) { 2.27 list->items = reallocated_list; 2.28 list->items[list->count] = item;
3.1 --- a/suffix_list.h Thu Sep 15 13:29:06 2011 +0200 3.2 +++ b/suffix_list.h Thu Sep 15 13:38:03 2011 +0200 3.3 @@ -20,7 +20,6 @@ 3.4 #endif 3.5 3.6 suffix_list_t* new_suffix_list_t(); 3.7 -void destroy_suffix_list_t(suffix_list_t*); 3.8 void add_suffix(suffix_list_t*, char*); 3.9 3.10 #ifdef _cplusplus