Changeset 5208 in orxonox.OLD for trunk/src/util/resource_manager.cc

Timestamp:

Sep 19, 2005, 8:36:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: first fruits of valgrind…. delete[] are fine now

File:

• trunk/src/util/resource_manager.cc (modified) (10 diffs)

trunk/src/util/resource_manager.cc

@@ -96 +96 @@
   if (isDir(realDir))
     {
-      delete this->dataDir;
+      delete[] this->dataDir;
       this->dataDir = new char[strlen(realDir)+1];
       strcpy(this->dataDir, realDir);
@@ -126 +126 @@
   sprintf(testFile, "%s%s", this->dataDir, fileInside);
   retVal = isFile(testFile);
-  delete testFile;
+  delete[] testFile;
   return retVal;
 }
@@ -382 +382 @@
     {
       PRINTF(2)("Resource %s could not be loaded\n", fileName);
+      delete[] tmpResource->name;
       delete tmpResource;
       return NULL;
@@ -456 +457 @@
           // deleting the List Entry:
           PRINTF(4)("Resource %s safely removed.\n", resource->name);
-          delete []resource->name;
+          delete[] resource->name;
           this->resourceList->remove(resource);
         }
@@ -625 +626 @@
       else
         {
-          delete tmpDirName;
+          delete[] tmpDirName;
           return false;
         }
@@ -653 +654 @@
                             ))
         {
-          delete tmpFileName;
+          delete[] tmpFileName;
           return true;
         }
       else
         {
-          delete tmpFileName;
+          delete[] tmpFileName;
           return false;
         }
@@ -664 +665 @@
   else
     {
-      delete tmpFileName;
+      delete[] tmpFileName;
       return false;
     }
@@ -682 +683 @@
     {
       PRINTF(1)("could not open %s fro writing\n", fileName);
+      delete[] tmpName;
       return false;
     }
   fclose(stream);
 
-  delete tmpName;
+  delete[] tmpName;
 }
 
@@ -699 +701 @@
   char* tmpName = ResourceManager::homeDirCheck(fileName);
   unlink(tmpName);
-  delete tmpName;
+  delete[] tmpName;
 }
 
@@ -748 +750 @@
   else
     {
-      delete retName;
+      delete[] retName;
       return NULL;
     }