Fix compiler warnings

Author: mobizt

examples/CloudStorage/OTA/OTA.ino

@@ -32,10 +32,18 @@
 #define ENABLE_USER_CONFIG
 #define ENABLE_SERVICE_AUTH
 #define ENABLE_CLOUD_STORAGE
+#define ENABLE_OTA
 
 #include <FirebaseClient.h>
 #include "ExampleFunctions.h" // Provides the functions used in the examples.
 
+// For Arduino SAMD21 OTA supports.
+// See https://github.com/mobizt/FirebaseClient#ota-update.
+#if defined(ARDUINO_ARCH_SAMD)
+#include <Internal_Storage_OTA.h>
+#define OTA_STORAGE InternalStorage
+#endif
+
 #define WIFI_SSID "WIFI_AP"
 #define WIFI_PASSWORD "WIFI_PASSWORD"
 

examples/RealtimeDatabase/OTA/OTA.ino

@@ -31,6 +31,7 @@
 #define ENABLE_USER_CONFIG
 #define ENABLE_USER_AUTH
 #define ENABLE_DATABASE
+#define ENABLE_OTA
 
 #include <FirebaseClient.h>
 #include "ExampleFunctions.h" // Provides the functions used in the examples.

examples/Storage/OTA/OTA.ino

@@ -29,10 +29,18 @@
 #define ENABLE_USER_CONFIG
 #define ENABLE_USER_AUTH
 #define ENABLE_STORAGE
+#define ENABLE_OTA
 
 #include <FirebaseClient.h>
 #include "ExampleFunctions.h" // Provides the functions used in the examples.
 
+// For Arduino SAMD21 OTA supports.
+// See https://github.com/mobizt/FirebaseClient#ota-update.
+#if defined(ARDUINO_ARCH_SAMD)
+#include <Internal_Storage_OTA.h>
+#define OTA_STORAGE InternalStorage
+#endif
+
 #define WIFI_SSID "WIFI_AP"
 #define WIFI_PASSWORD "WIFI_PASSWORD"
 
@@ -44,6 +52,7 @@
 #define STORAGE_BUCKET_ID "BUCKET-NAME.appspot.com"
 
 void processData(AsyncResult &aResult);
+void restart();
 
 UserAuth user_auth(API_KEY, USER_EMAIL, USER_PASSWORD, 3000 /* expire period in seconds (<3600) */);
 

src/ExampleFunctions.h

@@ -39,6 +39,8 @@ void set_ssl_client_insecure_and_buffer(SSL_CLIENT &client)
 #if defined(ESP8266)
     client.setBufferSizes(4096, 1024);
 #endif
+#else
+    (void)client;
 #endif
 }
 
@@ -81,7 +83,6 @@ void file_operation_callback(File &file, const char *filename, file_operating_mo
     file = myFile;
 }
 
-
 void print_file_content(const String &filename)
 {
     File file = MY_FS.open(filename, FILE_OPEN_MODE_READ);
@@ -110,7 +111,7 @@ void print_file_content(const String &filename)
 #endif
 
 // Debug information printing
-static void auth_debug_print(AsyncResult &aResult)
+void auth_debug_print(AsyncResult &aResult)
 {
     if (aResult.isEvent())
     {
@@ -129,7 +130,7 @@ static void auth_debug_print(AsyncResult &aResult)
 }
 
 // Function to get NTP server time.
-static uint32_t get_ntp_time()
+uint32_t get_ntp_time()
 {
     uint32_t ts = 0;
     Serial.print("Getting time from NTP server... ");
@@ -156,7 +157,7 @@ static uint32_t get_ntp_time()
 }
 
 // Token type information printing
-static void print_token_type(FirebaseApp &app)
+void print_token_type(FirebaseApp &app)
 {
     Firebase.printf("Auth Token: %s\n", app.getToken().c_str());
     firebase_token_type type = app.getTokenType();

src/FirebaseClient.h

@@ -341,7 +341,7 @@ static FirebaseClient Firebase;
  *
  */
 template <typename T>
-static user_auth_data &getAuth(T &auth) { return auth.get(); }
+inline user_auth_data &getAuth(T &auth) { return auth.get(); }
 
 /**
  * Initialize the FirebaseApp and wait.
@@ -352,7 +352,7 @@ static user_auth_data &getAuth(T &auth) { return auth.get(); }
  * @param timeoutMs Optional. The await timeout in milliseconds.
  * @param cb  Optional. The async result callback (AsyncResultCallback).
  */
-static void initializeApp(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, unsigned long timeoutMs = 0, AsyncResultCallback cb = NULL)
+inline void initializeApp(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, unsigned long timeoutMs = 0, AsyncResultCallback cb = NULL)
 {
     app.setCallback(cb);
     Firebase.initializeApp(aClient, app, auth, timeoutMs);
@@ -367,7 +367,7 @@ static void initializeApp(AsyncClientClass &aClient, FirebaseApp &app, user_auth
  * @param cb The async result callback (AsyncResultCallback).
  * @param uid The user specified UID of async result (optional).
  */
-static void initializeApp(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResultCallback cb, const String &uid = "")
+inline void initializeApp(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResultCallback cb, const String &uid = "")
 {
     app.setUID(uid);
     initializeApp(aClient, app, auth, 0, cb);
@@ -381,7 +381,7 @@ static void initializeApp(AsyncClientClass &aClient, FirebaseApp &app, user_auth
  * @param auth The user auth data (user_auth_data) which is the struct that holds the user sign-in credentials and tokens that obtained from the authentication/authorization classes via getAuth function.
  * @param aResult The async result (AsyncResult).
  */
-static void initializeApp(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResult &aResult)
+inline void initializeApp(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResult &aResult)
 {
     app.setAsyncResult(aResult);
     Firebase.initializeApp(aClient, app, auth);
@@ -392,7 +392,7 @@ static void initializeApp(AsyncClientClass &aClient, FirebaseApp &app, user_auth
  *
  * @param app The FirebaseApp class object to handle authentication/authorization task.
  */
-static void deinitializeApp(FirebaseApp &app) { Firebase.deinitializeApp(app); }
+inline void deinitializeApp(FirebaseApp &app) { Firebase.deinitializeApp(app); }
 
 /**
  * Signup a new user.
@@ -403,7 +403,7 @@ static void deinitializeApp(FirebaseApp &app) { Firebase.deinitializeApp(app); }
  * @param timeoutMs Optional. The await timeout in milliseconds.
  * @param cb  Optional. The async result callback (AsyncResultCallback).
  */
-static void signup(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, unsigned long timeoutMs = 0, AsyncResultCallback cb = NULL)
+inline void signup(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, unsigned long timeoutMs = 0, AsyncResultCallback cb = NULL)
 {
     app.setCallback(cb);
     Firebase.signup(aClient, app, auth, timeoutMs);
@@ -418,7 +418,7 @@ static void signup(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &
  * @param cb The async result callback (AsyncResultCallback).
  * @param uid The user specified UID of async result (optional).
  */
-static void signup(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResultCallback cb, const String &uid = "")
+inline void signup(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResultCallback cb, const String &uid = "")
 {
     app.setUID(uid);
     app.setCallback(cb);
@@ -433,7 +433,7 @@ static void signup(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &
  * @param auth The user auth data (user_auth_data) which holds the user credentials from USerAccount class.
  * @param aResult The async result (AsyncResult).
  */
-static void signup(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResult &aResult)
+inline void signup(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResult &aResult)
 {
     Serial.println("Warning. The AsyncResult is not needed any more when calling the signup.");
     app.setAsyncResult(aResult);
@@ -449,7 +449,7 @@ static void signup(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &
  * @param timeoutMs Optional. The await timeout in milliseconds.
  * @param cb  Optional. The async result callback (AsyncResultCallback).
  */
-static void resetPassword(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, unsigned long timeoutMs = 0, AsyncResultCallback cb = NULL)
+inline void resetPassword(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, unsigned long timeoutMs = 0, AsyncResultCallback cb = NULL)
 {
     app.setCallback(cb);
     Firebase.resetPassword(aClient, app, auth, timeoutMs);
@@ -464,7 +464,7 @@ static void resetPassword(AsyncClientClass &aClient, FirebaseApp &app, user_auth
  * @param cb The async result callback (AsyncResultCallback).
  * @param uid The user specified UID of async result (optional).
  */
-static void resetPassword(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResultCallback cb, const String &uid = "")
+inline void resetPassword(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResultCallback cb, const String &uid = "")
 {
     app.setUID(uid);
     app.setCallback(cb);
@@ -479,7 +479,7 @@ static void resetPassword(AsyncClientClass &aClient, FirebaseApp &app, user_auth
  * @param auth The user auth data (user_auth_data) which holds the user credentials from USerAccount class.
  * @param aResult The async result (AsyncResult).
  */
-static void resetPassword(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResult &aResult)
+inline void resetPassword(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResult &aResult)
 {
     app.setAsyncResult(aResult);
     Firebase.resetPassword(aClient, app, auth);
@@ -494,7 +494,7 @@ static void resetPassword(AsyncClientClass &aClient, FirebaseApp &app, user_auth
  * @param timeoutMs Optional. The await timeout in milliseconds.
  * @param cb  Optional. The async result callback (AsyncResultCallback).
  */
-static void verify(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, unsigned long timeoutMs = 0, AsyncResultCallback cb = NULL)
+inline void verify(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, unsigned long timeoutMs = 0, AsyncResultCallback cb = NULL)
 {
     app.setCallback(cb);
     Firebase.verify(aClient, app, auth, timeoutMs);
@@ -509,7 +509,7 @@ static void verify(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &
  * @param cb The async result callback (AsyncResultCallback).
  * @param uid The user specified UID of async result (optional).
  */
-static void verify(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResultCallback cb, const String &uid = "")
+inline void verify(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResultCallback cb, const String &uid = "")
 {
     app.setUID(uid);
     app.setCallback(cb);
@@ -524,7 +524,7 @@ static void verify(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &
  * @param auth The user auth data (user_auth_data) which holds the user credentials from USerAccount class.
  * @param aResult The async result (AsyncResult).
  */
-static void verify(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResult &aResult)
+inline void verify(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResult &aResult)
 {
     app.setAsyncResult(aResult);
     Firebase.verify(aClient, app, auth);
@@ -539,7 +539,7 @@ static void verify(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &
  * @param timeoutMs Optional. The await timeout in milliseconds.
  * @param cb  Optional. The async result callback (AsyncResultCallback).
  */
-static void deleteUser(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, unsigned long timeoutMs = 0, AsyncResultCallback cb = NULL)
+inline void deleteUser(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, unsigned long timeoutMs = 0, AsyncResultCallback cb = NULL)
 {
     app.setCallback(cb);
     Firebase.deleteUser(aClient, app, auth, timeoutMs);
@@ -554,7 +554,7 @@ static void deleteUser(AsyncClientClass &aClient, FirebaseApp &app, user_auth_da
  * @param cb The async result callback (AsyncResultCallback).
  * @param uid The user specified UID of async result (optional).
  */
-static void deleteUser(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResultCallback cb, const String &uid = "")
+inline void deleteUser(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResultCallback cb, const String &uid = "")
 {
     app.setUID(uid);
     app.setCallback(cb);
@@ -569,7 +569,7 @@ static void deleteUser(AsyncClientClass &aClient, FirebaseApp &app, user_auth_da
  * @param auth The user auth data (user_auth_data) which holds the user credentials from USerAccount class.
  * @param aResult The async result (AsyncResult).
  */
-static void deleteUser(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResult &aResult)
+inline void deleteUser(AsyncClientClass &aClient, FirebaseApp &app, user_auth_data &auth, AsyncResult &aResult)
 {
     app.setAsyncResult(aResult);
     Firebase.deleteUser(aClient, app, auth);

src/client/SSLClient/client/BSSL_SSL_Client.cpp

@@ -2239,15 +2239,11 @@ void *BSSL_SSL_Client::mallocImpl(size_t len, bool clear)
 #endif
 
     p = reinterpret_cast<void *>(malloc(newLen));
-    bool nn = p ? true : false;
-
+   
 #if defined(ESP_SSLCLIENT_ESP8266_USE_EXTERNAL_HEAP)
     ESP.resetHeap();
 #endif
 
-    if (!nn)
-        return NULL;
-
 #endif
     if (clear)
         memset(p, 0, newLen);

src/cloud_storage/CloudStorage.h

@@ -64,7 +64,7 @@ class CloudStorage : public AppBase
     /**
      * Perform the async task repeatedly (DEPRECATED).
      */
-    void loop() { loopImpl(__PRETTY_FUNCTION__); }
+    void loop() { loopImpl(); }
 
     /** Download object from the Google Cloud Storage.
      *

src/core/AppBase.h

@@ -34,7 +34,7 @@ class AppBase
         }
     }
 
-    static void staticLoop(app_token_t *aToken, uint32_t cvec_addr)
+    static void staticLoop(const app_token_t *aToken, uint32_t cvec_addr)
     {
         std::vector<uint32_t> cVec = *reinterpret_cast<std::vector<uint32_t> *>(cvec_addr);
 
@@ -90,15 +90,15 @@ class AppBase
 
     void resetAppImpl()
     {
-        if (this->app_addr && this->cvec_address_list_addr && reinterpret_cast<std::vector<cvec_address_info_t> *>(this->cvec_address_list_addr))
+        if (this->app_addr && this->cvec_address_list_addr > 0)
             removeCvecAddressList(reinterpret_cast<std::vector<cvec_address_info_t> *>(this->cvec_address_list_addr), this->app_addr);
         this->app_addr = 0;
         this->app_token = nullptr;
         this->avec_addr = 0; // AsyncClient vector (list) address
         this->ul_dl_task_running_addr = 0;
     }
 
-    void loopImpl(const char *src)
+    void loopImpl()
     {
 
         if (displayInfoTimer.remaining() == 0 || !displayInfoTimer.isRunning())
@@ -133,7 +133,7 @@ class AppBase
     void addRemoveClientVecBase(AsyncClientClass *aClient, uint32_t cvec_addr, bool add) { aClient->addRemoveClientVec(cvec_addr, add); }
     void handleRemoveBase(AsyncClientClass *aClient) { aClient->handleRemove(); }
     void removeSlotBase(AsyncClientClass *aClient, uint8_t slot, bool sse = true) { aClient->removeSlot(slot, sse); }
-    size_t slotCountBase(AsyncClientClass *aClient) { return aClient->slotCount(); }
+    size_t slotCountBase(const AsyncClientClass *aClient) { return aClient->slotCount(); }
     void setLastErrorBase(AsyncResult *aResult, int code, const String &message)
     {
         if (aResult)