Fixing recursive calls and other CI problems

Author: LeStarch

Fw/Types/Assert.cpp

@@ -1,6 +1,6 @@
 #include <FpConfig.hpp>
 #include <Fw/Types/Assert.hpp>
-#include <Fw/Types/ExternalString.hpp>
+#include <Fw/Types/format.hpp>
 #include <Fw/Types/StringUtils.hpp>
 #include <cassert>
 #include <cstdio>
@@ -14,7 +14,9 @@
 namespace Fw {
 
 void defaultPrintAssert(const CHAR* msg) {
-    (void) fwrite(msg, sizeof(CHAR), static_cast<size_t>(Fw::StringUtils::string_length(msg, FW_ASSERT_TEXT_SIZE)), stderr);
+    // Write to stderr w/o formatting
+    (void) fputs(msg, stderr);
+    (void) fputs("\n", stderr);
 }
 
 void defaultReportAssert(FILE_NAME_ARG file,
@@ -28,40 +30,41 @@ void defaultReportAssert(FILE_NAME_ARG file,
                          FwAssertArgType arg6,
                          CHAR* destBuffer,
                          NATIVE_INT_TYPE buffSize) {
-    Fw::ExternalString external(destBuffer, static_cast<Fw::ExternalString::SizeType>(buffSize));
+    static_assert(std::numeric_limits<FwSizeType>::mac() >= std::numeric_limits<NATIVE_INT_TYPE>(buffSize));
     switch (numArgs) {
         case 0:
-            (void)external.format(fileIdFs, file, lineNo);
+            (void)stringFormat(destBuffer,  static_cast<FwSizeType>(buffSize), fileIdFs, file, lineNo);
             break;
         case 1:
-            (void)external.format(fileIdFs " %" PRI_FwAssertArgType, file, lineNo, arg1);
+            (void)stringFormat(destBuffer,  static_cast<FwSizeType>(buffSize),
+                               fileIdFs " %" PRI_FwAssertArgType, file, lineNo, arg1);
             break;
         case 2:
-            (void)external.format(fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType, file,
-                           lineNo, arg1, arg2);
+            (void)stringFormat(destBuffer,  static_cast<FwSizeType>(buffSize),
+                               fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType, file, lineNo, arg1, arg2);
             break;
         case 3:
-            (void)external.format(
-                           fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType, file,
-                           lineNo, arg1, arg2, arg3);
+            (void)stringFormat(destBuffer,  static_cast<FwSizeType>(buffSize),
+                               fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType, file,
+                               lineNo, arg1, arg2, arg3);
             break;
         case 4:
-            (void)external.format(
-                           fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType
-                                    " %" PRI_FwAssertArgType,
+            (void)stringFormat(destBuffer,  static_cast<FwSizeType>(buffSize),
+                               fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType
+                                        " %" PRI_FwAssertArgType,
                            file, lineNo, arg1, arg2, arg3, arg4);
             break;
         case 5:
-            (void)external.format(
-                           fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType
-                                    " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType,
-                           file, lineNo, arg1, arg2, arg3, arg4, arg5);
+            (void)stringFormat(destBuffer,  static_cast<FwSizeType>(buffSize),
+                               fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType
+                                        " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType,
+                               file, lineNo, arg1, arg2, arg3, arg4, arg5);
             break;
         case 6:
-            (void)external.format(
-                           fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType
-                                    " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType,
-                           file, lineNo, arg1, arg2, arg3, arg4, arg5, arg6);
+            (void)stringFormat(destBuffer,  static_cast<FwSizeType>(buffSize),
+                               fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType
+                                        " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType,
+                               file, lineNo, arg1, arg2, arg3, arg4, arg5, arg6);
             break;
         default:  // in an assert already, what can we do?
             break;

Fw/Types/snprintf_format.cpp

@@ -2,18 +2,15 @@
 // \title  format.cpp
 // \author mstarch
 // \brief  cpp file for c-string format function as a implementation using snprintf
-//
-// \copyright
-// Copyright (C) 2025 California Institute of Technology.
-// ALL RIGHTS RESERVED.  United States Government Sponsorship
-// acknowledged.
 // ======================================================================
 #include <Fw/Types/format.hpp>
 #include <limits>
 #include <cstdio>
 
 Fw::FormatStatus Fw::stringFormat(char* destination, const FwSizeType maximumSize, const char* formatString, va_list args) {
     Fw::FormatStatus formatStatus = Fw::FormatStatus::SUCCESS;
+    // Force null termination in error cases
+    destination[0] = 0;
     // Check format string
     if (formatString == nullptr) {
         formatStatus = Fw::FormatStatus::INVALID_FORMAT_STRING;
@@ -31,4 +28,4 @@ Fw::FormatStatus Fw::stringFormat(char* destination, const FwSizeType maximumSiz
         }
     }
     return formatStatus;
-}
+}