Revision 91:48069375dffa, committed 2015-03-20

Comitter:

xinlei

Date:

Fri Mar 20 14:27:10 2015 +0000

Parent:

90:423177e8a401

Child:

92:0acd11870c6a

Commit message:

Get rid of all annoying warning messages.

Changed in this revision

--- a/DeviceBootstrap.cpp	Fri Mar 20 13:55:21 2015 +0000
+++ b/DeviceBootstrap.cpp	Fri Mar 20 14:27:10 2015 +0000
@@ -11,9 +11,9 @@
 
 DeviceBootstrap::DeviceBootstrap(AbstractSmartRest& client, DeviceIO& io, DeviceInfo& deviceInfo, DeviceMemory& deviceMemory) :
     _client(client),
-    _io(io),
     _deviceInfo(deviceInfo),
-    _deviceMemory(deviceMemory)
+    _deviceMemory(deviceMemory),
+    _io(io)
 {
     *_username = *_password = '\0';
 }

--- a/DeviceBootstrap.h	Fri Mar 20 13:55:21 2015 +0000
+++ b/DeviceBootstrap.h	Fri Mar 20 14:27:10 2015 +0000
@@ -37,8 +37,8 @@
     DeviceInfo& _deviceInfo;
     DeviceMemory& _deviceMemory;
     DeviceIO& _io;
-    char _username[DEVICE_BOOTSTRAP_CREDENTIALS_LENGTH],                    
-         _password[DEVICE_BOOTSTRAP_CREDENTIALS_LENGTH];
+    char _username[DEVICE_BOOTSTRAP_CREDENTIALS_LENGTH];
+    char _password[DEVICE_BOOTSTRAP_CREDENTIALS_LENGTH];
 };
 
 #endif
\ No newline at end of file

--- a/DeviceIntegration.cpp	Fri Mar 20 13:55:21 2015 +0000
+++ b/DeviceIntegration.cpp	Fri Mar 20 14:27:10 2015 +0000
@@ -5,10 +5,11 @@
 #include "IntegerValue.h"
 #include "logging.h"
 
-DeviceIntegration::DeviceIntegration(AbstractSmartRest& client, SmartRestTemplate& tpl, long& deviceId, DeviceInfo& deviceInfo) :
+DeviceIntegration::DeviceIntegration(AbstractSmartRest& client, SmartRestTemplate& tpl,
+    long& deviceId, DeviceInfo& deviceInfo) :
+    _deviceId(deviceId),
+    _tpl(tpl),
     _client(client),
-    _tpl(tpl),
-    _deviceId(deviceId),
     _deviceInfo(deviceInfo)
 {
     _init = false;

--- a/MbedSmartRest.lib	Fri Mar 20 13:55:21 2015 +0000
+++ b/MbedSmartRest.lib	Fri Mar 20 14:27:10 2015 +0000
@@ -1,1 +1,1 @@
-http://developer.mbed.org/users/xinlei/code/MbedSmartRest/#16192696c106
+http://developer.mbed.org/users/xinlei/code/MbedSmartRest/#81dfc04ce0bb

--- a/config/ConfigurationSynchronization.cpp	Fri Mar 20 13:55:21 2015 +0000
+++ b/config/ConfigurationSynchronization.cpp	Fri Mar 20 14:27:10 2015 +0000
@@ -6,9 +6,9 @@
 #include "logging.h"
 
 ConfigurationSynchronization::ConfigurationSynchronization(AbstractSmartRest& client, SmartRestTemplate& tpl, long& deviceId, DeviceMemory& deviceMemory, DeviceConfiguration& deviceConfiguration, ConfigurationProperties& configurationProperties) :
-    _client(client),
+    _deviceId(deviceId),
     _tpl(tpl),
-    _deviceId(deviceId),
+    _client(client),
     _deviceMemory(deviceMemory),
     _deviceConfiguration(deviceConfiguration),
     _configurationProperties(configurationProperties)

--- a/measurement/AccelerationMeasurement.cpp	Fri Mar 20 13:55:21 2015 +0000
+++ b/measurement/AccelerationMeasurement.cpp	Fri Mar 20 14:27:10 2015 +0000
@@ -12,9 +12,9 @@
 
 AccelerationMeasurement::AccelerationMeasurement(AbstractSmartRest& client, SmartRestTemplate& tpl, long& deviceId, 
     DeviceIO& io, DeviceInfo& deviceInfo, DisplayInfo& displayInfo) :
-    _client(client),
+    _deviceId(deviceId),
     _tpl(tpl),
-    _deviceId(deviceId),
+    _client(client),
     _sensor(SDA,SCL),
     _io(io),
     _deviceInfo(deviceInfo),

--- a/measurement/LocationUpdate.cpp	Fri Mar 20 13:55:21 2015 +0000
+++ b/measurement/LocationUpdate.cpp	Fri Mar 20 14:27:10 2015 +0000
@@ -12,9 +12,9 @@
 
 LocationUpdate::LocationUpdate(AbstractSmartRest& client, SmartRestTemplate& tpl, long& deviceId, GPSTracker& gpsTracker, 
     DeviceIO& io, DeviceInfo& deviceInfo, DisplayInfo& displayInfo) :
-    _client(client),
+    _deviceId(deviceId),
     _tpl(tpl),
-    _deviceId(deviceId),
+    _client(client),
     _gpsTracker(gpsTracker),
     _io(io),
     _deviceInfo(deviceInfo),

--- a/operation/OperationExecutor.cpp	Fri Mar 20 13:55:21 2015 +0000
+++ b/operation/OperationExecutor.cpp	Fri Mar 20 14:27:10 2015 +0000
@@ -15,8 +15,8 @@
                                      DisplayInfo& displayInfo) :
     _init(false),
     _deviceId(deviceId),
+    _tpl(tpl),
     _client(client),
-    _tpl(tpl),
     _configurationSynchronization(configurationSynchronization),
     _io(io),
     _displayInfo(displayInfo)
@@ -54,7 +54,6 @@
 
 bool OperationExecutor::executeOperation(OperationStore::Operation& op)
 {
-    uint8_t found; bool relayState; char message[256];
     ComposedRecord record;
     ParsedRecord received;
     
@@ -68,7 +67,9 @@
         return false;
     }
     
-    found = 0;
+    uint8_t found = 0;
+    bool relayState;
+    char message[256];
     while (_client.receive(received) == SMARTREST_SUCCESS) {
         if ((received.values() == 4) &&
             (received.value(0).valueType() == VALUE_INTEGER) &&
@@ -76,7 +77,7 @@
             (received.value(2).valueType() == VALUE_INTEGER) &&
             (received.value(2).integerValue() == op.identifier) &&
             (received.value(3).valueType() == VALUE_CHARACTER)) {
-            relayState = (strcmp("CLOSED", received.value(3).characterValue()) == 0);
+            relayState = strcmp("CLOSED", received.value(3).characterValue()) == 0;
             found = FOUND_RELAY;
             break;
         }       
@@ -90,7 +91,7 @@
             message[127] = '\0';
             found = FOUND_MESSAGE;
             break;
-        }     
+        }
         if ((received.values() == 4) &&
             (received.value(0).valueType() == VALUE_INTEGER) &&
             (received.value(0).integerValue() == 222) &&
@@ -106,12 +107,9 @@
     _client.stop();
 
     switch (found) {
-    case FOUND_RELAY:
-        return executeRelayStateUpdate(relayState);
-    case FOUND_MESSAGE:
-        return executeMessageDisplay(message);
-    case FOUND_CONFIGURATION:
-        return executeUpdateConfiguration(message);
+    case FOUND_RELAY:         return executeRelayStateUpdate(relayState);
+    case FOUND_MESSAGE:       return executeMessageDisplay(message);
+    case FOUND_CONFIGURATION: return executeUpdateConfiguration(message);
     default:
         aWarning("Unsupported configuration received.\r\n");
         if (getLevel() == A_DEBUG) {

--- a/util/RtosSmartRest.cpp	Fri Mar 20 13:55:21 2015 +0000
+++ b/util/RtosSmartRest.cpp	Fri Mar 20 14:27:10 2015 +0000
@@ -2,8 +2,8 @@
 
 RtosSmartRest::RtosSmartRest(const char *host, uint16_t port, const char *identifier, MDMSerial& mdm, uint8_t tries) :
     _host(host),
+    _identifier(identifier),
     _port(port),
-    _identifier(identifier),
     _tries(tries),
     _username(NULL),
     _password(NULL),

--- a/util/RtosSmartRest.h	Fri Mar 20 13:55:21 2015 +0000
+++ b/util/RtosSmartRest.h	Fri Mar 20 14:27:10 2015 +0000
@@ -18,13 +18,13 @@
         MbedSmartRest *inst;
     };
 
-    uint8_t setAuthorization(const char*, const char*);
-    uint8_t bootstrap(const DataGenerator&);
-    uint8_t send(const DataGenerator&, const char* = NULL);
-    uint8_t stream(const char*, const Record&, const char* = NULL);
-    uint8_t receive(ParsedRecord&);
-    void stop();
-    const char * getIdentifier();
+    virtual uint8_t setAuthorization(const char*, const char*);
+    virtual uint8_t bootstrap(const DataGenerator&);
+    virtual uint8_t send(const DataGenerator&, const char* = NULL);
+    virtual uint8_t stream(const char*, const Record&, const char* = NULL);
+    virtual uint8_t receive(ParsedRecord&);
+    virtual void stop();
+    virtual const char * getIdentifier();
     
 protected:
     MbedSmartRest * instance();

--- a/util/SmartRestTemplate.cpp	Fri Mar 20 13:55:21 2015 +0000
+++ b/util/SmartRestTemplate.cpp	Fri Mar 20 14:27:10 2015 +0000
@@ -11,6 +11,7 @@
     if (_len == SMARTREST_TEMPLATE_FIXED_SIZE)
         return false;
     _buffer[_len++] = line;
+    return true;
 }
 
 size_t SmartRestTemplate::writeTo(AbstractDataSink& sink) const

--- a/util/SmartRestTemplate.h	Fri Mar 20 13:55:21 2015 +0000
+++ b/util/SmartRestTemplate.h	Fri Mar 20 14:27:10 2015 +0000
@@ -15,9 +15,9 @@
     SmartRestTemplate();
     bool add(const char*);
     
-    size_t writeTo(AbstractDataSink&) const;
-    size_t writtenLength() const;
-    DataGenerator* copy() const;
+    virtual size_t writeTo(AbstractDataSink&) const;
+    virtual size_t writtenLength() const;
+    virtual DataGenerator* copy() const;
 
 private:
     const char *_buffer[SMARTREST_TEMPLATE_FIXED_SIZE];