fix #309: change return type of cFram::saveField() to bool

mcci-catena · Jul 13, 2021 · f9b2274 · f9b2274
1 parent 6c1db30
commit f9b2274
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/Catena_Fram.h b/src/Catena_Fram.h
@@ -113,19 +113,19 @@ class cFram : public cPersistentStorage
                         char **argv
                         );
 
-        void saveField(
+        bool saveField(
                 cFramStorage::StandardKeys uKey,
                 const uint8_t *pValue,
                 size_t nValue
                 );
 
         template <typename T>
-        void saveField(
+        bool saveField(
                 cFramStorage::StandardKeys uKey,
                 const T &field
                 )
                 {
-                this->saveField(uKey, (const uint8_t *)&field, sizeof(field));
+                return this->saveField(uKey, (const uint8_t *)&field, sizeof(field));
                 };
 
         bool getField(

diff --git a/src/lib/Catena_Fram.cpp b/src/lib/Catena_Fram.cpp
@@ -615,23 +615,35 @@ McciCatena::cFram::writeItemData(
 	return fResult;
 	}
 
-void McciCatena::cFram::saveField(
+bool McciCatena::cFram::saveField(
         cFramStorage::StandardKeys uKey,
         const uint8_t *pValue,
         size_t nValue
         )
         {
         cFram::Cursor cursor(this, uKey);
 
+        bool fResult;
+
+        fResult = true;
         if (! cursor.create())
                 {
                 gLog.printf(gLog.kError,
                         "%s: can't save uKey(0x%x) %u bytes\n",
                         __FUNCTION__, uKey, nValue
                         );
+                fResult = false;
+                }
+
+        if (! cursor.put(pValue, nValue))
+                {
+                gLog.printf(gLog.kError, "%s: can't put uKey(0xx) %u bytes\n",
+                        __func__, uKey, nValue
+                        );
+                fResult = false;
                 }
 
-        cursor.put(pValue, nValue);
+        return fResult;
         }
 
 bool McciCatena::cFram::getField(