diff options
Diffstat (limited to 'lib/dir.c')
| -rw-r--r-- | lib/dir.c | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -1,6 +1,5 @@ #include <dirent.h> #include <lib/dir.h> -#include <lib/mem/galloc.h> #include <stdlib.h> #include <string.h> #include <sys/stat.h> @@ -21,7 +20,7 @@ char **list_directory(char *dirname) { DIR *d; struct dirent *dir; d = opendir(dirname); - char **file_names = (char **)g_malloc(sizeof(char *)); + char **file_names = (char **)malloc(sizeof(char *)); if (file_names == NULL) { return NULL; } @@ -33,20 +32,20 @@ char **list_directory(char *dirname) { // When a regular file is reached /// Create space for it in the list char **temp = - g_realloc(file_names, (file_count + 1 + 1) * sizeof(char *)); + realloc(file_names, (file_count + 1 + 1) * sizeof(char *)); if (temp == NULL) { for (size_t file_idx = 0; file_idx < file_count; file_idx++) { - g_free(file_names[file_idx]); + free(file_names[file_idx]); } return NULL; } file_names = temp; /// Create space for the name file_names[file_count] = - g_calloc(strlen(dir->d_name) + 1, sizeof(char)); + calloc(strlen(dir->d_name) + 1, sizeof(char)); if (file_names[file_count] == NULL) { for (size_t file_idx = 0; file_idx < file_count; file_idx++) { - g_free(file_names[file_idx]); + free(file_names[file_idx]); } return NULL; } @@ -66,7 +65,7 @@ char *full_path(char *dir, char *file) { char *fpath = NULL; size_t dir_len = strlen(dir); size_t file_len = strlen(file); - fpath = (char *)g_calloc(dir_len + file_len + 2, sizeof(char)); + fpath = (char *)calloc(dir_len + file_len + 2, sizeof(char)); if (fpath == NULL) { return NULL; } |