SetAl() argument int -> int64_t

cgi-estonia-space · Oct 9, 2024 · 37f0f79 · 37f0f79
1 parent 4044425
commit 37f0f79
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/envisat_format/include/envisat_lvl1_mph.h b/envisat_format/include/envisat_lvl1_mph.h
@@ -114,8 +114,8 @@ struct Lvl1MPH {
 
     void SetSbt(const ASARMetadata& md) {
         SetStr(utc_sbt_time, "UTC_SBT_TIME", PtimeToStr(md.utc_sbt_time));
-        SetAl64(sat_binary_time, "SAT_BINARY_TIME", md.sat_binary_time);
-        SetAl64(clock_step, "CLOCK_STEP", md.clock_step, "<ps>");
+        SetAl(sat_binary_time, "SAT_BINARY_TIME", md.sat_binary_time);
+        SetAl(clock_step, "CLOCK_STEP", md.clock_step, "<ps>");
     }
 
     void SetLeap(const ASARMetadata& md) {

diff --git a/envisat_format/include/envisat_mph_sph_str_utils.h b/envisat_format/include/envisat_mph_sph_str_utils.h
@@ -71,13 +71,7 @@ inline std::string ToAs(int val) {
     return buf;
 }
 
-inline std::string ToAl(int val) {
-    char buf[20];
-    snprintf(buf, 20, "%+011d", val);  // Sign specifier counts as additional integer part count.
-    return buf;
-}
-
-inline std::string ToAl64(int64_t val) {
+inline std::string ToAl(int64_t val) {
     char buf[20];
     snprintf(buf, 20, "%+011ld", val);  // Sign specifier counts as additional integer part count.
     return buf;
@@ -134,7 +128,7 @@ void SetAs(uc (&arr)[N], const char* keyword, int val, const char* unit = "") {
 }
 
 template <size_t N>
-void SetAl(uc (&arr)[N], const char* keyword, int val, const char* unit = "") {
+void SetAl(uc (&arr)[N], const char* keyword, int64_t val, const char* unit = "") {
     std::string buf = keyword;
     buf += "=";
     buf += ToAl(val);
@@ -143,16 +137,6 @@ void SetAl(uc (&arr)[N], const char* keyword, int val, const char* unit = "") {
     CopyStr(arr, buf);
 }
 
-template <size_t N>
-void SetAl64(uc (&arr)[N], const char* keyword, int64_t val, const char* unit = "") {
-    std::string buf = keyword;
-    buf += "=";
-    buf += ToAl64(val);
-    buf += unit;
-    buf += '\n';
-    CopyStr(arr, buf);
-}
-
 template <size_t N>
 void SetAc(uc (&arr)[N], const char* keyword, int val, const char* unit = "") {
     std::string buf = keyword;