Diff: io/DeviceMemory.cpp

Revision:

94:61d44636f020

Parent:

70:f489ca11f254

Child:

97:ea056f6be2e8

--- a/io/DeviceMemory.cpp	Mon Apr 13 14:24:58 2015 +0000
+++ b/io/DeviceMemory.cpp	Mon Apr 20 15:04:23 2015 +0000
@@ -13,22 +13,22 @@
 
 bool DeviceMemory::loadPlatformCredentials(char *username, char *password, size_t len)
 {
-    char buffer[len*2+3]; int res, len2;
-
-    if ((res = _mdm.readFile(PLATFORM_CREDENTIALS_FILE, buffer, sizeof(buffer))) < 0)
+    char buffer[len*2+3]; 
+    int res = _mdm.readFile(PLATFORM_CREDENTIALS_FILE, buffer, sizeof(buffer));
+    if (res < 0)
         return false;
 
     buffer[(size_t)res] = '\0';
+    int len2=0;
     sscanf(buffer, "%s\n%s\n%n", username, password, &len2);
     return res == len2;
 }
 
 bool DeviceMemory::savePlatformCredentials(char *username, char *password, size_t len)
 {
-    char buffer[len*2+3]; int res;
-    
-    res = snprintf(buffer, sizeof(buffer), "%s\n%s\n", username, password);
-    if ((res < 0) || (res >= sizeof(buffer)))
+    char buffer[len*2+3]; 
+    int res = snprintf(buffer, sizeof(buffer), "%s\n%s\n", username, password);
+    if (res<0 || res>=sizeof(buffer))
         return false;
 
     return ((resetPlatformCredentials()) && (res == _mdm.writeFile(PLATFORM_CREDENTIALS_FILE, buffer, res)));
@@ -42,9 +42,8 @@
 
 bool DeviceMemory::loadConfiguration(char *cfg, size_t len)
 {
-    int res;
-
-    if ((res = _mdm.readFile(CONFIGURATION_FILE, cfg, len)) < 0)
+    int res = _mdm.readFile(CONFIGURATION_FILE, cfg, len);
+    if (res < 0)
         return false;
     
     cfg[(size_t)res] = '\0';
@@ -53,10 +52,7 @@
 
 bool DeviceMemory::saveConfiguration(char *cfg)
 {
-    size_t len;
-    
-    len = strlen(cfg);
-
+    size_t len = strlen(cfg);
     return ((resetConfiguration()) && (_mdm.writeFile(CONFIGURATION_FILE, cfg, len) == len));
 }