Diff: io/Storage.cpp

Revision:

111:ee9ae4a5e55c

Parent:

104:a3703ca4a4a4

Child:

113:3872569be2af

--- a/io/Storage.cpp	Wed May 13 15:00:24 2015 +0000
+++ b/io/Storage.cpp	Fri May 15 10:13:19 2015 +0000
@@ -10,17 +10,16 @@
 {
     char buffer[len*2+3];
     int res = pMdm->readFile(CREDENTIALS_FILE, buffer, sizeof(buffer));
-    if (res < 0) {
+    if (res <= 0) {
         return false;
     } else {
         buffer[res] = 0;
-        int l = 0;
-        sscanf(buffer, "%s\n%s\n%n", username, password, &l);
-        return res==l;
+        int l = sscanf(buffer, "%s\n%s\n", username, password);
+        return l==2;
     }
 }
 
-bool delCredential()
+bool resetCredential()
 {
     return pMdm->delFile(CREDENTIALS_FILE);
 }
@@ -29,7 +28,7 @@
 {
     char buffer[len*2+3];
     int res = snprintf(buffer, sizeof(buffer), "%s\n%s\n", username, password);
-    delCredential();
+    pMdm->delFile(CREDENTIALS_FILE);
     return pMdm->writeFile(CREDENTIALS_FILE, buffer, res)==res;
 }
 
@@ -41,13 +40,8 @@
     return res;
 }
 
-bool delConfigFile()
-{
-    return pMdm->delFile(CONFIGURATION_FILE);
-}
-
 bool saveConfigFile(char *cfg, size_t len)
 {
-    delConfigFile();
+    pMdm->delFile(CONFIGURATION_FILE);
     return pMdm->writeFile(CONFIGURATION_FILE, cfg, len)==len;
 }