lib: make dlist<dlistString> work correctly

This patch does some refactoring on dlistString to make it work correctly with the new and type-safe dlist.
bareos · Feb 24, 2022 · 703f965 · 703f965
1 parent 0be6f81
commit 703f965
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt
@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2021 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2022 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -58,7 +58,7 @@ set(BAREOS_SRCS
     crypto_wrap.cc
     daemon.cc
     devlock.cc
-    dlist.cc
+    dlist_string.cc
     edit.cc
     fnmatch.cc
     guid_to_name.cc

diff --git a/core/src/lib/dlink.h b/core/src/lib/dlink.h
@@ -2,7 +2,7 @@
    BAREOS® - Backup Archiving REcovery Open Sourced
 
    Copyright (C) 2004-2010 Free Software Foundation Europe e.V.
-   Copyright (C) 2016-2021 Bareos GmbH & Co. KG
+   Copyright (C) 2016-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -24,13 +24,8 @@
 #define BAREOS_LIB_DLINK_H_
 
 template <typename T> struct dlink {
-  T* next;
-  T* prev;
-  dlink()
-  {
-    next = nullptr;
-    prev = nullptr;
-  }
+  T* next{nullptr};
+  T* prev{nullptr};
 };
 
 #endif  // BAREOS_LIB_DLINK_H_
diff --git a/core/src/lib/dlist.cc → core/src/lib/dlist_string.cc b/core/src/lib/dlist.cc → core/src/lib/dlist_string.cc
@@ -2,7 +2,7 @@
    BAREOS® - Backup Archiving REcovery Open Sourced
 
    Copyright (C) 2003-2011 Free Software Foundation Europe e.V.
-   Copyright (C) 2013-2021 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -28,6 +28,7 @@
  */
 
 #include "lib/dlist.h"
+#include "lib/dlist_string.h"
 
 /* String helpers for dlist usage */
 
@@ -39,7 +40,7 @@ dlistString* new_dlistString(const char* str)
 dlistString* new_dlistString(const char* str, int len)
 {
   dlistString* node;
-  node = (dlistString*)malloc(sizeof(dlink<char*>) + len + 1);
+  node = (dlistString*)malloc(sizeof(dlistString) + len);
   bstrncpy(node->c_str(), str, len + 1);
   return node;
 }
diff --git a/core/src/lib/dlist_string.h b/core/src/lib/dlist_string.h
@@ -35,7 +35,7 @@ class dlistString {
  public:
   char* c_str() { return str_; }
 
-  dlink<char> link;
+  dlink<dlistString> link;
 
  private:
   char str_[1];