From a348db476710effd922bc217148c0b3fdc495258 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 4 Jun 2019 14:59:05 -0700 Subject: [PATCH] ircd::db: Rename possibly conflicting constant. --- ircd/db.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ircd/db.cc b/ircd/db.cc index fd0edc554..c6c40d7d8 100644 --- a/ircd/db.cc +++ b/ircd/db.cc @@ -3423,22 +3423,22 @@ ircd::db::database::sst::tool(const vector_view &args) { const ctx::uninterruptible::nothrow ui; - static const size_t ARG_MAX {16}; - static const size_t ARG_MAX_LEN {256}; - thread_local char arg[ARG_MAX][ARG_MAX_LEN] + static const size_t arg_max {16}; + static const size_t arg_max_len {256}; + thread_local char arg[arg_max][arg_max_len] { "./sst_dump" }; size_t i(0); - char *argv[ARG_MAX] { arg[i++] }; - for(; i < ARG_MAX - 1 && i - 1 < args.size(); ++i) + char *argv[arg_max] { arg[i++] }; + for(; i < arg_max - 1 && i - 1 < args.size(); ++i) { strlcpy(arg[i], args.at(i - 1)); argv[i] = arg[i]; } argv[i++] = nullptr; - assert(i <= ARG_MAX); + assert(i <= arg_max); rocksdb::SSTDumpTool tool; const int ret