Merge pull request #124 from bonitoo-io/fix/compilation_warnings

fix: fixing compilation warnings

Author: vlastahajek

CHANGELOG.md

@@ -4,6 +4,8 @@
 ### Fixes
 - [#121](https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino/pull/121) - Fixed compile error in case of warning is treated as an error
 - [#122](https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino/pull/122) - Deleting WiFiClient instance to avoid memory leaking when the InfluxDBClient is reinitialized
+- [#124](https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino/pull/124) - Fixed compilation warnings
+
 ### Doc
 - [#120](https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino/pull/120) - Improved language wording in the Readme
 

src/InfluxData.cpp

@@ -0,0 +1,38 @@
+/**
+ * 
+ * InfluxData.cpp: InfluxDB Client for Arduino
+ * 
+ * MIT License
+ * 
+ * Copyright (c) 2018-2020 Tobias Schürg
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+*/
+#include "InfluxData.h"
+#include "util/helpers.h"
+
+void InfluxData::setTimestamp(long int seconds) 
+{ 
+    _timestamp = timeStampToString(seconds) + "000000000"; 
+}
+
+ String InfluxData::toString() const { 
+    String t; 
+    return createLineProtocol(t); 
+}

src/InfluxData.h

@@ -32,7 +32,6 @@ class InfluxData : public Point {
 
   void addValue(String key, float value) { addField(key, value); }
   void addValueString(String key, String value) { addField(key, value); }
-  void setTimestamp(long int seconds) { _timestamp = String(seconds) + "000000000"; }
-
-  String toString() const { return toLineProtocol(); }
+  void setTimestamp(long int seconds);
+  String toString() const;
 };

src/InfluxDb.cpp

@@ -142,7 +142,7 @@ boolean Influxdb::write() {
  * Write a single measurement into the db.
  */
 boolean Influxdb::write(InfluxData data) { 
-    return write(data.toLineProtocol());
+    return write(pointToLineProtocol(data));
 }
 
 /**

src/InfluxDbClient.cpp

@@ -509,7 +509,7 @@ bool InfluxDBClient::flushBufferInternal(bool flashOnlyFull) {
        yield();
     }
     //Have we emptied the buffer?
-    INFLUXDB_CLIENT_DEBUG("[D] Success: %d, _bufferPointer: %d, _batchPointer: %d, _writeBuffer[_bufferPointer]_%x\n",success,_bufferPointer,_batchPointer, _writeBuffer[_bufferPointer]);
+    INFLUXDB_CLIENT_DEBUG("[D] Success: %d, _bufferPointer: %d, _batchPointer: %d, _writeBuffer[_bufferPointer]_%p\n",success,_bufferPointer,_batchPointer, _writeBuffer[_bufferPointer]);
     if(_batchPointer == _bufferPointer && !_writeBuffer[_bufferPointer]) {
         _bufferPointer = 0;
         _batchPointer = 0;
@@ -534,7 +534,7 @@ void  InfluxDBClient::dropCurrentBatch() {
 }
 
 String InfluxDBClient::pointToLineProtocol(const Point& point) {
-    return point.toLineProtocol(_writeOptions._defaultTags);
+    return point.createLineProtocol(_writeOptions._defaultTags);
 }
 
 bool InfluxDBClient::validateConnection() {
@@ -693,7 +693,7 @@ static String escapeJSONString(String &value) {
     int i,from = 0;
     while((i = value.indexOf('"',from)) > -1) {
         d++;
-        if(i == value.length()-1) {
+        if(i == (int)value.length()-1) {
             break;
         }
         from = i+1;
@@ -711,7 +711,7 @@ static String escapeJSONString(String &value) {
             case '\r': ret += "\\r"; break;
             case '\t': ret += "\\t"; break;
             default:
-                if ('\x00' <= c && c <= '\x1f') {
+                if (c <= '\x1f') {
                     ret += "\\u";
                     char buf[3 + 8 * sizeof(unsigned int)];
                     sprintf(buf,  "\\u%04u", c);

src/InfluxDbClient.h

@@ -91,8 +91,7 @@ class InfluxDBClient {
     // flushInterval - maximum number of seconds data will be held in buffer before are written to the db. 
     //                 Data are written either when number of points in buffer reaches batchSize or time of  
     // preserveConnection - true if HTTP connection should be kept open. Usable for frequent writes.
-    [[deprecated("Use setWriteOptions(const WriteOptions &writeOptions)")]]
-    void setWriteOptions(WritePrecision precision, uint16_t batchSize = 1, uint16_t bufferSize = 5, uint16_t flushInterval = 60, bool preserveConnection = true); 
+    void setWriteOptions(WritePrecision precision, uint16_t batchSize = 1, uint16_t bufferSize = 5, uint16_t flushInterval = 60, bool preserveConnection = true) __attribute__ ((deprecated("Use setWriteOptions(const WriteOptions &writeOptions)")));
     // Sets custom write options. See WriteOptions doc for more info. 
     // Must be called before calling any method initiating a connection to server.
     // Example: 

src/Point.cpp

@@ -60,11 +60,16 @@ void Point::putField(String name, String value) {
 }
 
 String Point::toLineProtocol(String includeTags) const {
-    String line =  _measurement;
-    line.reserve(1 + includeTags.length() + 1 + _tags.length() + 1 + _fields.length() + 1 + _timestamp.length());
-    if(includeTags.length()>0) {
+    return createLineProtocol(includeTags);
+}
+
+String Point::createLineProtocol(String &incTags) const {
+    String line;
+    line.reserve(_measurement.length() + 1 + incTags.length() + 1 + _tags.length() + 1 + _fields.length() + 1 + _timestamp.length());
+    line += _measurement;
+    if(incTags.length()>0) {
         line += ",";
-        line += includeTags;
+        line += incTags;
     }
     if(hasTags()) {
         line += ",";
@@ -79,7 +84,7 @@ String Point::toLineProtocol(String includeTags) const {
         line += _timestamp;
     }
     return line;
-}
+ }
 
 void  Point::setTime(WritePrecision precision) {
     struct timeval tv;

src/Point.h

@@ -35,6 +35,7 @@
  * It defines data to be written to InfluxDB.
  */
 class Point {
+friend class InfluxDBClient;
   public:
     Point(String measurement);
     // Adds string tag 
@@ -67,17 +68,19 @@ class Point {
     bool hasTags() const   { return _tags.length() > 0; }
     // True if a point contains timestamp
     bool hasTime() const   { return _timestamp.length() > 0; }
-    // Creates line protocol with optionaly added tags
-    [[deprecated("Use InfluxDBClient::pointToLineProtocol()")]]
-    String toLineProtocol(String includeTags = "") const;
+    // Creates line protocol with optionally added tags
+    String toLineProtocol(String includeTags = "") const __attribute__ ((deprecated("Use InfluxDBClient::pointToLineProtocol()")));
     // returns current timestamp
     String getTime() const { return _timestamp; } 
   protected:
     String _measurement;
     String _tags;
     String _fields;
-    String _timestamp;    
+    String _timestamp;
+  protected:    
     // method for formating field into line protocol
     void putField(String name, String value);
+    // Creates line protocol string
+    String createLineProtocol(String &incTags) const;
 };
 #endif //_POINT_H_

src/query/FluxParser.cpp

@@ -62,7 +62,7 @@ int FluxQueryResult::getColumnIndex(String columnName) {
 
 FluxValue FluxQueryResult::getValueByIndex(int index) {
     FluxValue ret;
-    if(index >= 0 && index < _data->_columnValues.size()) {
+    if(index >= 0 && index < (int)_data->_columnValues.size()) {
         ret = _data->_columnValues[index];
     }
     return ret;
@@ -156,7 +156,7 @@ bool FluxQueryResult::next() {
                    INFLUXDB_CLIENT_DEBUG("Error '%s'\n", _data->_error.c_str());
 			       return false;
                 } else {
-                    for(int i=1;i < vals.size(); i++) {
+                    for(unsigned int i=1;i < vals.size(); i++) {
                         _data->_columnNames.push_back(vals[i]);
                     }
                 }
@@ -174,7 +174,7 @@ bool FluxQueryResult::next() {
             INFLUXDB_CLIENT_DEBUG("Error '%s'\n", _data->_error.c_str());
 			return false;
 		}
-		for(int i=1;i < vals.size(); i++) {
+		for(unsigned int i=1;i < vals.size(); i++) {
             FluxBase *v  = nullptr;
             if(vals[i].length() > 0) {
                 v = convertValue(vals[i], _data->_columnDatatypes[i-1]);
@@ -191,7 +191,7 @@ bool FluxQueryResult::next() {
 		_data->_tablePosition++;
         clearColumns();
         _data->_tableChanged = true;
-		for(int i=1;i < vals.size(); i++) {
+		for(unsigned int i=1;i < vals.size(); i++) {
 			_data->_columnDatatypes.push_back(vals[i]);
 		}
 		parsingState = ParsingStateNameRow;

src/util/helpers.cpp

@@ -34,7 +34,7 @@ void timeSync(const char *tzInfo, const char* ntpServer1, const char* ntpServer2
   // Wait till time is synced
   Serial.print("Syncing time");
   int i = 0;
-  while (time(nullptr) < 1000000000ul && i < 40) {
+  while (time(nullptr) < 1000000000l && i < 40) {
     Serial.print(".");
     delay(500);
     i++;
@@ -129,7 +129,7 @@ static char hex_digit(char c) {
 String urlEncode(const char* src) {
     int n=0;
     char c,*s = (char *)src;
-    while (c = *s++) {
+    while ((c = *s++)) {
         if(strchr(invalidChars, c)) {
             n++;
         }