Update stringList_t code

Author: phaag

src/libnffile/flist.c

@@ -476,6 +476,7 @@ static int GetFileList(stringlist_t *source_dirs, flist_t *flist) {
                 s[MAXPATHLEN - 1] = '\0';
                 last_file_ptr = strdup(s);
                 levels_last_file = dirlevels(last_file_ptr);
+                free(r);
             }
         }
     }
@@ -968,7 +969,6 @@ static void *FileLister_thr(void *arg) {
 
     // stringlist of all directories
     stringlist_t source_dirs = {0};
-    InitStringlist(&source_dirs, 16);
 
     if (flist->multiple_dirs) {
         char *expanded = ExpandWildcard(flist->multiple_dirs);

src/libnffile/nffile.c

@@ -730,23 +730,21 @@ static nffile_t *NewFile(uint32_t num_workers) {
 }  // End of NewFile
 
 static nffile_t *OpenFileStatic(const char *filename, unsigned workerSlots) {
-    struct stat stat_buf;
-    int fd = 0;
-
     if (filename == NULL) return NULL;
 
-    // regular file
+    // check regular file
     if (access(filename, F_OK) < 0) {
         LogError("access() '%s': %s", filename, strerror(errno));
         return NULL;
     }
 
-    fd = open(filename, O_RDONLY);
+    int fd = open(filename, O_RDONLY);
     if (fd < 0) {
         LogError("Error open file: %s", strerror(errno));
         return NULL;
     }
 
+    struct stat stat_buf;
     if (fstat(fd, &stat_buf) < 0) {
         LogError("fstat() '%s': %s", filename, strerror(errno));
         return NULL;

src/libnffile/util.c

@@ -647,37 +647,43 @@ char *DurationString(uint64_t duration) {
     return s;
 }  // End of DurationString
 
-void InitStringlist(stringlist_t *list, uint32_t capacity) {
-    list->list = NULL;
-    list->num_strings = 0;
-    list->capacity = capacity;
-
-}  // End of InitStringlist
-
-void InsertString(stringlist_t *list, char *string) {
-    if (!list->list) {
-        // default if not yet initialised
-        if (list->capacity == 0) list->capacity = 8;
-        list->num_strings = 0;
-        list->list = (char **)malloc(list->capacity * sizeof(char *));
-        if (!list->list) {
-            LogError("malloc() error in %s line %d: %s", __FILE__, __LINE__, strerror(errno));
-            exit(250);
-        }
+stringlist_t *NewStringlist(stringlist_t *list, uint32_t capacity) {
+    stringlist_t *sl = calloc(1, sizeof(stringlist_t));
+    if (!sl) {
+        LogError("calloc() error in %s line %d: %s", __FILE__, __LINE__, strerror(errno));
+        return NULL;
     }
-    list->list[list->num_strings++] = string ? strdup(string) : NULL;
+    return sl;
+}  // End of NewStringlist
 
-    // if all slots used, double capacity
-    if (list->num_strings == list->capacity) {
-        list->capacity += list->capacity;
-        list->list = (char **)realloc(list->list, list->capacity * sizeof(char *));
-        if (!list->list) {
+void InsertString(stringlist_t *sl, const char *s) {
+    if (sl->num_strings == sl->capacity) {
+        sl->capacity = sl->capacity ? sl->capacity * 2 : 16;
+        sl->list = (char **)realloc(sl->list, sl->capacity * sizeof(char *));
+        if (!sl->list) {
             LogError("realloc() error in %s line %d: %s", __FILE__, __LINE__, strerror(errno));
-            exit(250);
+            exit(EXIT_FAILURE);
         }
     }
 
-}  // End of InsertString
+    if (s) {
+        sl->list[sl->num_strings++] = strdup(s);
+    } else {
+        /* allow explicit NULL sentinel */
+        sl->list[sl->num_strings++] = NULL;
+    }
+}  // // End of InsertString
+
+void ClearStringList(stringlist_t *sl) {
+    if (sl->list) free(sl->list);
+    memset(sl, 0, sizeof(stringlist_t));
+}  // End of ClearStringList
+
+void FreeStringList(stringlist_t *sl) {
+    if (sl == NULL) return;
+    ClearStringList(sl);
+    free(sl);
+}  // End of ClearStringList
 
 void format_number(uint64_t num, numStr s, int plain, int fixed_width) {
     double f = num;

src/libnffile/util.h

@@ -125,9 +125,13 @@ void LogInfo(char *format, ...);
 
 void LogVerbose(char *format, ...);
 
-void InitStringlist(stringlist_t *list, uint32_t capacity);
+stringlist_t *NewStringlist(stringlist_t *list, uint32_t capacity);
 
-void InsertString(stringlist_t *list, char *string);
+void ClearStringList(stringlist_t *sl);
+
+void FreeStringList(stringlist_t *sl);
+
+void InsertString(stringlist_t *sl, const char *s);
 
 timeWindow_t *ScanTimeFrame(char *tstring);
 

src/nfexpire/nfexpire.c

@@ -97,12 +97,11 @@ void CheckDataDir(char *datadir) {
 
 channel_t *GetChannelList(char *datadir, int is_profile, int do_rescan) {
     channel_t **c, *channel;
-    stringlist_t dirlist;
+    stringlist_t dirlist = {0};
     struct stat stat_buf;
     int i;
 
     // Generate list of directories
-    InitStringlist(&dirlist, 32);
     if (is_profile) {
         DIR *PDIR = opendir(datadir);
         struct dirent *entry;