bnet: renamed network dump files to match class names

bareos · Jul 4, 2019 · 09d55ed · 09d55ed
1 parent c60d59e
commit 09d55ed
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/core/src/console/console.cc b/core/src/console/console.cc
@@ -37,7 +37,7 @@
 #include "include/jcr.h"
 #include "lib/berrno.h"
 #include "lib/bnet.h"
-#include "lib/bsock_network_dump.h"
+#include "lib/bnet_network_dump.h"
 #include "lib/bsock_tcp.h"
 #include "lib/bstringlist.h"
 #include "lib/qualified_resource_name_type_converter.h"

diff --git a/core/src/filed/dir_cmd.cc b/core/src/filed/dir_cmd.cc
@@ -53,7 +53,7 @@
 #include "lib/tls_conf.h"
 #include "lib/parse_conf.h"
 #include "lib/bsock_tcp.h"
-#include "lib/bsock_network_dump.h"
+#include "lib/bnet_network_dump.h"
 #include "lib/watchdog.h"
 #include "lib/util.h"
 

diff --git a/core/src/filed/filed.cc b/core/src/filed/filed.cc
@@ -35,7 +35,7 @@
 #include "filed/socket_server.h"
 #include "lib/mntent_cache.h"
 #include "lib/daemon.h"
-#include "lib/bsock_network_dump.h"
+#include "lib/bnet_network_dump.h"
 #include "lib/bsignal.h"
 #include "lib/parse_conf.h"
 #include "lib/watchdog.h"

diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt
@@ -47,8 +47,8 @@ include_directories(
    ${WRAP_INCLUDE_DIRS})
 
 set (BAREOS_SRCS  address_conf.cc alist.cc attr.cc attribs.cc backtrace.cc base64.cc
-   berrno.cc bget_msg.cc binflate.cc bnet_server_tcp.cc bnet.cc  bpipe.cc
-   breg.cc bregex.cc bsnprintf.cc bsock.cc bsock_network_dump.cc bsock_network_dump_private.cc
+   berrno.cc bget_msg.cc binflate.cc bnet_server_tcp.cc bnet.cc  bnet_network_dump.cc
+   bnet_network_dump_private.cc bpipe.cc breg.cc bregex.cc bsnprintf.cc bsock.cc
    bsock_tcp.cc bstringlist.cc
    bsys.cc btime.cc btimers.cc  cbuf.cc
    connection_pool.cc cram_md5.cc crypto.cc  crypto_cache.cc

diff --git a/core/src/lib/bsock_network_dump.cc → core/src/lib/bnet_network_dump.cc b/core/src/lib/bsock_network_dump.cc → core/src/lib/bnet_network_dump.cc
@@ -20,8 +20,8 @@
 */
 
 #include "include/bareos.h"
-#include "bsock_network_dump.h"
-#include "bsock_network_dump_private.h"
+#include "bnet_network_dump.h"
+#include "bnet_network_dump_private.h"
 #include "include/make_unique.h"
 
 std::unique_ptr<BnetDump> BnetDump::Create(std::string own_qualified_name)

diff --git a/core/src/lib/bsock_network_dump.h → core/src/lib/bnet_network_dump.h b/core/src/lib/bsock_network_dump.h → core/src/lib/bnet_network_dump.h
@@ -19,8 +19,8 @@
    02110-1301, USA.
 */
 
-#ifndef BAREOS_LIB_BSOCK_NETWORK_DUMP_H_
-#define BAREOS_LIB_BSOCK_NETWORK_DUMP_H_
+#ifndef BAREOS_LIB_BNET_NETWORK_DUMP_H_
+#define BAREOS_LIB_BNET_NETWORK_DUMP_H_
 
 class BareosResource;
 class QualifiedResourceNameTypeConverter;
@@ -50,4 +50,4 @@ class BnetDump {
   std::unique_ptr<BnetDumpPrivate> impl_;
 };
 
-#endif  // BAREOS_LIB_BSOCK_NETWORK_DUMP_H_
+#endif  // BAREOS_LIB_BNET_NETWORK_DUMP_H_
diff --git a/core/src/lib/bsock_network_dump_private.cc → core/src/lib/bnet_network_dump_private.cc b/core/src/lib/bsock_network_dump_private.cc → core/src/lib/bnet_network_dump_private.cc
@@ -20,7 +20,7 @@
 */
 
 #include "include/bareos.h"
-#include "bsock_network_dump_private.h"
+#include "bnet_network_dump_private.h"
 
 #include "include/make_unique.h"
 #include "lib/ascii_control_characters.h"

diff --git a/core/src/lib/bsock_network_dump_private.h → core/src/lib/bnet_network_dump_private.h b/core/src/lib/bsock_network_dump_private.h → core/src/lib/bnet_network_dump_private.h
@@ -19,8 +19,8 @@
    02110-1301, USA.
 */
 
-#ifndef BAREOS_LIB_BSOCK_NETWORK_DUMP_PRIVATE_H_
-#define BAREOS_LIB_BSOCK_NETWORK_DUMP_PRIVATE_H_
+#ifndef BAREOS_LIB_BNET_NETWORK_DUMP_PRIVATE_H_
+#define BAREOS_LIB_BNET_NETWORK_DUMP_PRIVATE_H_
 
 #include "lib/bareos_resource.h"
 
@@ -78,4 +78,4 @@ class BnetDumpPrivate {
   State state = State::kWaitForDestinationName;
 };
 
-#endif  // BAREOS_LIB_BSOCK_NETWORK_DUMP_PRIVATE_H_
+#endif  // BAREOS_LIB_BNET_NETWORK_DUMP_PRIVATE_H_
diff --git a/core/src/lib/bsock.h b/core/src/lib/bsock.h
@@ -43,7 +43,7 @@
 #include <functional>
 #include <cassert>
 #include "lib/address_conf.h"
-#include "lib/bsock_network_dump.h"
+#include "lib/bnet_network_dump.h"
 #include "lib/tls.h"
 #include "lib/s_password.h"
 #include "lib/tls_conf.h"

diff --git a/core/src/stored/authenticate.cc b/core/src/stored/authenticate.cc
@@ -34,7 +34,7 @@
 #include "include/jcr.h"
 #include "lib/parse_conf.h"
 #include "lib/bsock.h"
-#include "lib/bsock_network_dump.h"
+#include "lib/bnet_network_dump.h"
 #include "lib/util.h"
 
 namespace storagedaemon {

diff --git a/core/src/stored/stored.cc b/core/src/stored/stored.cc
@@ -50,7 +50,7 @@
 #include "stored/wait.h"
 #include "lib/berrno.h"
 #include "lib/bsock.h"
-#include "lib/bsock_network_dump.h"
+#include "lib/bnet_network_dump.h"
 #include "lib/daemon.h"
 #include "lib/bsignal.h"
 #include "lib/parse_conf.h"