[trafficserver] branch master updated: Version.cc: make clang-analyzer happy for cmake (#10639)

[bneradt]

This is an automated email from the ASF dual-hosted git repository.

bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 17a8179fc9 Version.cc: make clang-analyzer happy for cmake (#10639)
17a8179fc9 is described below

commit 17a8179fc90f27619c2a9c57bbc9c541588cc9fe
Author: Brian Neradt <brian.ner...@gmail.com>
AuthorDate: Wed Oct 18 14:44:25 2023 -0500

    Version.cc: make clang-analyzer happy for cmake (#10639)
    
    This addresses a clang-analyzer complaint about invalid_datetime being
    unused because BUILD_NUMBER is a constant "0" string for that build. To
    address this I simply move the computation and use of it below the check
    on BUILD_NUMBER.
---
 src/tscore/Version.cc | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/tscore/Version.cc b/src/tscore/Version.cc
index 87a632955b..d72f512fe8 100644
--- a/src/tscore/Version.cc
+++ b/src/tscore/Version.cc
@@ -45,23 +45,6 @@ void
 AppVersionInfo::setup(const char *pkg_name, const char *app_name, const char 
*app_version, const char *build_date,
                       const char *build_time, const char *build_machine, const 
char *build_person, const char *build_cflags)
 {
-  char month_name[8];
-  int year, month, day, hour, minute, second;
-  bool invalid_datetime;
-
-  static const char *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "???"};
-
-  invalid_datetime  = sscanf(build_time, "%d:%d:%d", &hour, &minute, &second) 
< 3;
-  invalid_datetime |= sscanf(build_date, "%3s %d %d", month_name, &day, &year) 
< 3;
-
-  // Jan=1, Feb=2 ... Dec=12, ???=13
-  for (month = 0; month < 11; month++) {
-    if (strcasecmp(months[month], month_name) == 0) {
-      break;
-    }
-  }
-  month++;
-
   ///////////////////////////////////////////
   // now construct the version information //
   ///////////////////////////////////////////
@@ -73,10 +56,29 @@ AppVersionInfo::setup(const char *pkg_name, const char 
*app_name, const char *ap
   // Otherwise take the build timestamp ("??????" if invalid).
   if (0 != strlen(BUILD_NUMBER)) {
     snprintf(BldNumStr, sizeof(BldNumStr), "%s", BUILD_NUMBER);
-  } else if (!invalid_datetime) {
-    snprintf(BldNumStr, sizeof(BldNumStr), "%02d%02d%02d", month, day, hour);
   } else {
-    snprintf(BldNumStr, sizeof(BldNumStr), "??????");
+    // Construct the BldNumStr from the build date and time.
+    char month_name[8];
+    int year, month, day, hour, minute, second;
+    bool invalid_datetime;
+
+    static const char *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "???"};
+
+    invalid_datetime  = sscanf(build_time, "%d:%d:%d", &hour, &minute, 
&second) < 3;
+    invalid_datetime |= sscanf(build_date, "%3s %d %d", month_name, &day, 
&year) < 3;
+
+    // Jan=1, Feb=2 ... Dec=12, ???=13
+    for (month = 0; month < 11; month++) {
+      if (strcasecmp(months[month], month_name) == 0) {
+        break;
+      }
+    }
+    month++;
+    if (invalid_datetime) {
+      snprintf(BldNumStr, sizeof(BldNumStr), "??????");
+    } else {
+      snprintf(BldNumStr, sizeof(BldNumStr), "%02d%02d%02d", month, day, hour);
+    }
   }
 
   snprintf(BldTimeStr, sizeof(BldTimeStr), "%s", build_time);