Rename base64.{cpp.h} to str_util

src/CMakeLists.txt

@@ -94,7 +94,7 @@ endif (IBVERBS_LIBRARIES)
 add_library(vitastor_common STATIC
 	epoll_manager.cpp etcd_state_client.cpp messenger.cpp addr_util.cpp
 	msgr_stop.cpp msgr_op.cpp msgr_send.cpp msgr_receive.cpp ringloop.cpp ../json11/json11.cpp
-	http_client.cpp osd_ops.cpp pg_states.cpp timerfd_manager.cpp base64.cpp ${MSGR_RDMA}
+	http_client.cpp osd_ops.cpp pg_states.cpp timerfd_manager.cpp str_util.cpp ${MSGR_RDMA}
 )
 target_compile_options(vitastor_common PUBLIC -fPIC)
 
@@ -194,7 +194,7 @@ configure_file(vitastor.pc.in vitastor.pc @ONLY)
 
 # vitastor-disk
 add_executable(vitastor-disk
-	disk_tool.cpp disk_simple_offsets.cpp crc32c.c base64.cpp ../json11/json11.cpp rw_blocking.cpp allocator.cpp ringloop.cpp blockstore_disk.cpp
+	disk_tool.cpp disk_simple_offsets.cpp crc32c.c str_util.cpp ../json11/json11.cpp rw_blocking.cpp allocator.cpp ringloop.cpp blockstore_disk.cpp
 )
 target_link_libraries(vitastor-disk
 	tcmalloc_minimal

src/cli.cpp

@@ -12,7 +12,7 @@
 #include "epoll_manager.h"
 #include "cluster_client.h"
 #include "pg_states.h"
-#include "base64.h"
+#include "str_util.h"
 
 static const char *exe_name = NULL;
 

src/cli_alloc_osd.cpp

@@ -4,7 +4,7 @@
 #include <ctype.h>
 #include "cli.h"
 #include "cluster_client.h"
-#include "base64.h"
+#include "str_util.h"
 
 #include <algorithm>
 

src/cli_common.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Vitaliy Filippov, 2019+
 // License: VNPL-1.1 (see README.md for details)
 
-#include "base64.h"
+#include "str_util.h"
 #include "cluster_client.h"
 #include "cli.h"
 

src/cli_create.cpp

@@ -4,7 +4,7 @@
 #include <ctype.h>
 #include "cli.h"
 #include "cluster_client.h"
-#include "base64.h"
+#include "str_util.h"
 
 // Create an image, snapshot or clone
 //

src/cli_df.cpp

@@ -3,7 +3,7 @@
 
 #include "cli.h"
 #include "cluster_client.h"
-#include "base64.h"
+#include "str_util.h"
 
 // List pools with space statistics
 struct pool_lister_t

src/cli_ls.cpp

@@ -4,7 +4,7 @@
 #include <algorithm>
 #include "cli.h"
 #include "cluster_client.h"
-#include "base64.h"
+#include "str_util.h"
 
 // List existing images
 //

src/cli_modify.cpp

@@ -3,7 +3,7 @@
 
 #include "cli.h"
 #include "cluster_client.h"
-#include "base64.h"
+#include "str_util.h"
 
 // Rename, resize image (and purge extra data on shrink) or change its readonly status
 struct image_changer_t

src/cli_rm.cpp

@@ -4,7 +4,7 @@
 #include <fcntl.h>
 #include "cli.h"
 #include "cluster_client.h"
-#include "base64.h"
+#include "str_util.h"
 
 // Remove layer(s): similar to merge, but alters metadata and processes multiple merge targets
 //

src/cli_status.cpp

@@ -3,7 +3,7 @@
 
 #include "cli.h"
 #include "cluster_client.h"
-#include "base64.h"
+#include "str_util.h"
 #include "pg_states.h"
 #include "http_client.h"
 

src/disk_simple_offsets.cpp

@@ -8,7 +8,7 @@
 #include <sys/stat.h>
 
 #include "json11/json11.hpp"
-#include "base64.h"
+#include "str_util.h"
 #include "blockstore.h"
 
 // Calculate offsets for a block device and print OSD command line parameters

src/disk_tool.cpp

@@ -21,7 +21,7 @@
 #include "blockstore_impl.h"
 #include "blockstore_disk.h"
 #include "osd_id.h"
-#include "base64.h"
+#include "str_util.h"
 #include "crc32c.h"
 #include "rw_blocking.h"
 

src/etcd_state_client.cpp

@@ -7,7 +7,7 @@
 #ifndef __MOCK__
 #include "addr_util.h"
 #include "http_client.h"
-#include "base64.h"
+#include "str_util.h"
 #endif
 
 etcd_state_client_t::~etcd_state_client_t()

src/http_client.cpp

@@ -14,7 +14,7 @@
 #include <stdexcept>
 
 #include "addr_util.h"
-#include "base64.h"
+#include "str_util.h"
 #include "json11/json11.hpp"
 #include "http_client.h"
 #include "timerfd_manager.h"

src/nfs_conn.cpp

@@ -5,7 +5,7 @@
 
 #include <sys/time.h>
 
-#include "base64.h"
+#include "str_util.h"
 
 #include "nfs_proxy.h"
 

src/nfs_portmap.cpp

@@ -12,7 +12,7 @@
 #include "malloc_or_die.h"
 #include "nfs_portmap.h"
 #include "sha256.h"
-#include "base64.h"
+#include "str_util.h"
 
 /*
  * The NULL procedure. All protocols/versions must provide a NULL procedure

src/nfs_proxy.cpp

@@ -19,7 +19,7 @@
 #include "nfs/portmap.h"
 
 #include "addr_util.h"
-#include "base64.h"
+#include "str_util.h"
 #include "nfs_proxy.h"
 #include "http_client.h"
 #include "cli.h"

src/osd_cluster.cpp

@@ -2,7 +2,7 @@
 // License: VNPL-1.1 (see README.md for details)
 
 #include "osd.h"
-#include "base64.h"
+#include "str_util.h"
 #include "etcd_state_client.h"
 #include "http_client.h"
 #include "osd_rmw.h"

src/osd_peering.cpp

@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "base64.h"
+#include "str_util.h"
 #include "osd.h"
 
 // Peering loop

src/str_util.cpp

@@ -3,7 +3,7 @@
 
 #include <assert.h>
 #include <string.h>
-#include "base64.h"
+#include "str_util.h"
 
 std::string base64_encode(const std::string &in)
 {