Diff: internal/types/FileList.cpp

Revision:

17:7268f365676b

Parent:

16:7f1d6d359787

Child:

24:e27e23297f02

--- a/internal/types/FileList.cpp	Wed Aug 13 04:41:04 2014 -0700
+++ b/internal/types/FileList.cpp	Sat Aug 23 05:39:17 2014 -0700
@@ -48,10 +48,10 @@
 {
     if(buffer == NULL)
     {
-        File* result = listHead;
+        WiconnectFile* result = listHead;
         while(result != NULL)
         {
-            File* tmp = result;
+            WiconnectFile* tmp = result;
             result = result->next;
             delete tmp;
         }
@@ -62,11 +62,11 @@
 WiconnectResult FileList::add(const char *typeStr, const char *flagsStr, const char* sizeStr, const char *versionStr, const char *nameStr)
 {
     WiconnectResult result;
-    File *res;
+    WiconnectFile *res;
 
     if(buffer == NULL)
     {
-        res = new File();
+        res = new WiconnectFile();
         if(res == NULL)
         {
             return WICONNECT_NULL_BUFFER;
@@ -74,14 +74,14 @@
     }
     else
     {
-        if(bufferLen < sizeof(File))
+        if(bufferLen < sizeof(WiconnectFile))
         {
             return WICONNECT_OVERFLOW;
         }
-        res = (File*)bufferPtr;
-        memset(res, 0, sizeof(File));
-        bufferLen -= sizeof(File);
-        bufferPtr += sizeof(File);
+        res = (WiconnectFile*)bufferPtr;
+        memset(res, 0, sizeof(WiconnectFile));
+        bufferLen -= sizeof(WiconnectFile);
+        bufferPtr += sizeof(WiconnectFile);
     }
 
     if(WICONNECT_FAILED(result, res->initWithListing(typeStr, flagsStr, sizeStr, versionStr, nameStr)))
@@ -110,7 +110,7 @@
 }
 
 /*************************************************************************************************/
-const File* FileList::getListHead() const
+const WiconnectFile* FileList::getListHead() const
 {
     return listHead;
 }
@@ -122,12 +122,12 @@
 }
 
 /*************************************************************************************************/
-const File* FileList::getResult(int i) const
+const WiconnectFile* FileList::getResult(int i) const
 {
     if(i >= count)
         return NULL;
 
-    File* result = listHead;
+    WiconnectFile* result = listHead;
     while(i-- != 0)
         result = result->next;
 
@@ -135,7 +135,7 @@
 }
 
 /*************************************************************************************************/
-const File* FileList::operator [](int i) const
+const WiconnectFile* FileList::operator [](int i) const
 {
     return getResult(i);
 }