From 7341675088672ba9bc20088adfedb7cd0145ccb4 Mon Sep 17 00:00:00 2001 From: nickeb96 Date: Mon, 7 May 2018 20:08:47 -0400 Subject: [PATCH] Moved history file path code to helper function --- src/readline.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/readline.cpp b/src/readline.cpp index 4b5aa04..f4539b9 100644 --- a/src/readline.cpp +++ b/src/readline.cpp @@ -62,6 +62,16 @@ public: namespace { +std::string get_hist_file_path() +{ + const gchar *hist_file_str = g_getenv("SDCV_HISTFILE"); + + if (hist_file_str != nullptr) + return std::string(hist_file_str); + else + return std::string(g_get_home_dir()) + G_DIR_SEPARATOR + ".sdcv_history"; +} + class real_readline : public IReadLine { @@ -70,15 +80,13 @@ public: { rl_readline_name = "sdcv"; using_history(); - const gchar *hist_file_str = g_getenv("SDCV_HISTFILE"); - const std::string histname = hist_file_str ? std::string(hist_file_str) : (std::string(g_get_home_dir()) + G_DIR_SEPARATOR + ".sdcv_history"); + const std::string histname = get_hist_file_path(); read_history(histname.c_str()); } ~real_readline() { - const gchar *hist_file_str = g_getenv("SDCV_HISTFILE"); - const std::string histname = hist_file_str ? std::string(hist_file_str) : (std::string(g_get_home_dir()) + G_DIR_SEPARATOR + ".sdcv_history"); + const std::string histname = get_hist_file_path(); write_history(histname.c_str()); const gchar *hist_size_str = g_getenv("SDCV_HISTSIZE"); int hist_size;