Merge pull request yedf2#41 from wangqing1218/fix_some

Fix some lint and make some code more rubust.
Mu-L · Aug 19, 2018 · 2bc32e8 · 2bc32e8
2 parents 17cc475 + 47a350b
commit 2bc32e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/handy/conf.cc b/handy/conf.cc
@@ -108,9 +108,9 @@ namespace {
     };
 }
 
-int Conf::parse(const string& filename1) {
-    filename = filename1;
-    FILE* file = fopen(filename.c_str(), "r");
+int Conf::parse(const string& filename) {
+    this->filename = filename;
+    FILE* file = fopen(this->filename.c_str(), "r");
     if (!file)
         return -1;
     unique_ptr<FILE, decltype(fclose)*> release2(file, fclose);

diff --git a/handy/conf.h b/handy/conf.h
@@ -10,7 +10,7 @@ struct Conf {
     // 0 success
     // -1 IOERROR
     // >0 line no of error
-    int parse(const std::string& filename1);
+    int parse(const std::string& filename);
 
     // Get a string value from INI file, returning default_value if not found.
     std::string get(std::string section, std::string name, std::string default_value);

diff --git a/handy/util.h b/handy/util.h
@@ -9,7 +9,10 @@
 namespace handy {
 
 struct noncopyable {
-    noncopyable() {};
+protected:
+    noncopyable() = default;
+    virtual ~noncopyable() = default;
+
     noncopyable(const noncopyable&) = delete;
     noncopyable& operator=(const noncopyable&) = delete;
 };