[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/libkmid
From:       Waldo Bastian <bastian () kde ! org>
Date:       2002-12-10 22:34:42
[Download RAW message or body]

CVS commit by waba: 

strcpy stuff


  M +6 -5      fmout.cc   1.21
  M +5 -5      gusout.cc   1.21
  M +3 -4      midimapper.cc   1.15


--- kdelibs/libkmid/fmout.cc  #1.20:1.21
@@ -64,5 +64,5 @@ FMOut::~FMOut()
   if (deleteFMPatchesDirectory)
   {
-    delete FMPatchesDirectory;
+    free((char *)FMPatchesDirectory);
     deleteFMPatchesDirectory = 0;
     FMPatchesDirectory="/etc";
@@ -327,8 +327,9 @@ void FMOut::setFMPatchesDirectory(const 
 {
   if ((dir==NULL)||(dir[0]==0)) return;
-  if (deleteFMPatchesDirectory) delete FMPatchesDirectory;
-  char *FMPatchesDirectory2=new char[strlen(dir)+1];
-  strcpy(FMPatchesDirectory2,dir);
-  FMPatchesDirectory = FMPatchesDirectory2;
+  if (deleteFMPatchesDirectory)
+        free((char *)FMPatchesDirectory);
+
+  FMPatchesDirectory = strdup(dir);
+
   deleteFMPatchesDirectory=1;
 }

--- kdelibs/libkmid/gusout.cc  #1.20:1.21
@@ -129,5 +129,5 @@ GUSOut::~GUSOut()
   if (delete_GUS_patches_directory)
   {
-    delete GUS_patches_directory;
+    free((char *)GUS_patches_directory);
     delete_GUS_patches_directory = 0;
     GUS_patches_directory="/etc";
@@ -323,8 +323,8 @@ void GUSOut::setGUSPatchesDirectory(cons
 {
     if ((dir==NULL)||(dir[0]==0)) return;
-    if (delete_GUS_patches_directory) delete GUS_patches_directory;
-    char *GUS_patches_directory2=new char[strlen(dir)+1];
-    strcpy(GUS_patches_directory2,dir);
-    GUS_patches_directory = GUS_patches_directory2;
+    if (delete_GUS_patches_directory)
+        free((char *)GUS_patches_directory);
+
+    GUS_patches_directory = strdup(dir);
     delete_GUS_patches_directory=1;
 }

--- kdelibs/libkmid/midimapper.cc  #1.14:1.15
@@ -56,5 +56,5 @@ MidiMapper::MidiMapper(const char *name)
 MidiMapper::~MidiMapper()
 {
-  delete _filename;
+  if (_filename) free(_filename);
   deallocateMaps();
 }
@@ -148,7 +148,6 @@ void MidiMapper::loadFile(const char *na
   char s[101];
   s[0] = 0;
-  if ( _filename != NULL ) delete _filename;
-  _filename = new char[ strlen(name)+1 ];
-  strcpy(_filename,name);
+  if ( _filename != NULL ) free(_filename);
+  _filename = strdup(name);
 #ifdef MIDIMAPPERDEBUG
   printf("Loading mapper ...\n");


[prev in list] [next in list] [prev in thread] [next in thread]