LogCleaner: make overdue_days_ unsigned int

Since the value of `LogCleaner::overdue_days_` should be >= 0, we can simply make it an unsigned int which also avoids unnecessary assertions. Signed-off-by: Marco Wang <m.aesophor@gmail.com>
google · Dec 13, 2021 · 3f4f658 · 3f4f658
1 parent baa7006
commit 3f4f658
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
@@ -627,7 +627,7 @@ typedef void (*logging_fail_func_t)();
 GOOGLE_GLOG_DLL_DECL void InstallFailureFunction(logging_fail_func_t fail_func);
 
 // Enable/Disable old log cleaner.
-GOOGLE_GLOG_DLL_DECL void EnableLogCleaner(int overdue_days);
+GOOGLE_GLOG_DLL_DECL void EnableLogCleaner(unsigned int overdue_days);
 GOOGLE_GLOG_DLL_DECL void DisableLogCleaner();
 GOOGLE_GLOG_DLL_DECL void SetApplicationFingerprint(const std::string& fingerprint);
 

diff --git a/src/logging.cc b/src/logging.cc
@@ -476,8 +476,10 @@ class LogCleaner {
  public:
   LogCleaner();
 
-  void Enable(int overdue_days);
+  // Setting overdue_days to 0 days will delete all logs.
+  void Enable(unsigned int overdue_days);
   void Disable();
+
   void Run(bool base_filename_selected,
            const string& base_filename,
            const string& filename_extension) const;
@@ -486,18 +488,19 @@ class LogCleaner {
 
  private:
   vector<string> GetOverdueLogNames(string log_directory,
-                                    int days,
+                                    unsigned int days,
                                     const string& base_filename,
                                     const string& filename_extension) const;
 
   bool IsLogFromCurrentProject(const string& filepath,
                                const string& base_filename,
                                const string& filename_extension) const;
 
-  bool IsLogLastModifiedOver(const string& filepath, int days) const;
+  bool IsLogLastModifiedOver(const string& filepath,
+                             unsigned int days) const;
 
   bool enabled_;
-  int overdue_days_;
+  unsigned int overdue_days_;
 };
 
 LogCleaner log_cleaner;
@@ -1299,10 +1302,7 @@ void LogFileObject::Write(bool force_flush,
 
 LogCleaner::LogCleaner() : enabled_(false), overdue_days_(7) {}
 
-void LogCleaner::Enable(int overdue_days) {
-  // Setting overdue_days to 0 days will delete all logs.
-  assert(overdue_days >= 0);
-
+void LogCleaner::Enable(unsigned int overdue_days) {
   enabled_ = true;
   overdue_days_ = overdue_days;
 }
@@ -1314,7 +1314,7 @@ void LogCleaner::Disable() {
 void LogCleaner::Run(bool base_filename_selected,
                      const string& base_filename,
                      const string& filename_extension) const {
-  assert(enabled_ && overdue_days_ >= 0);
+  assert(enabled_);
   assert(!base_filename_selected || !base_filename.empty());
 
   vector<string> dirs;
@@ -1344,7 +1344,7 @@ void LogCleaner::Run(bool base_filename_selected,
 }
 
 vector<string> LogCleaner::GetOverdueLogNames(string log_directory,
-                                              int days,
+                                              unsigned int days,
                                               const string& base_filename,
                                               const string& filename_extension) const {
   // The names of overdue logs.
@@ -1460,7 +1460,8 @@ bool LogCleaner::IsLogFromCurrentProject(const string& filepath,
   return true;
 }
 
-bool LogCleaner::IsLogLastModifiedOver(const string& filepath, int days) const {
+bool LogCleaner::IsLogLastModifiedOver(const string& filepath,
+                                       unsigned int days) const {
   // Try to get the last modified time of this file.
   struct stat file_stat;
 
@@ -2550,7 +2551,7 @@ void ShutdownGoogleLogging() {
   logging_directories_list = NULL;
 }
 
-void EnableLogCleaner(int overdue_days) {
+void EnableLogCleaner(unsigned int overdue_days) {
   log_cleaner.Enable(overdue_days);
 }