summaryrefslogtreecommitdiff
path: root/plugin.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-08-11 13:32:23 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2002-08-11 13:32:23 +0200
commit9a1a16f3d42b2f48b26eb3daef3a195fc0f2a13e (patch)
tree7d7d8667832651e37cd8de53296d0bcd32dba085 /plugin.c
parentb9c4cb0ec9c417c483be2a40cd66f839b063015f (diff)
downloadvdr-9a1a16f3d42b2f48b26eb3daef3a195fc0f2a13e.tar.gz
vdr-9a1a16f3d42b2f48b26eb3daef3a195fc0f2a13e.tar.bz2
Consistently using malloc/free and new/delete
Diffstat (limited to 'plugin.c')
-rw-r--r--plugin.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/plugin.c b/plugin.c
index b007951a..8d4d4cb5 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: plugin.c 1.6 2002/08/11 10:47:11 kls Exp $
+ * $Id: plugin.c 1.7 2002/08/11 11:21:00 kls Exp $
*/
#include "plugin.h"
@@ -102,7 +102,7 @@ void cPlugin::SetConfigDirectory(const char *Dir)
const char *cPlugin::ConfigDirectory(const char *PluginName)
{
static char *buffer = NULL;
- delete buffer;
+ free(buffer);
asprintf(&buffer, "%s/plugins%s%s", configDirectory, PluginName ? "/" : "", PluginName ? PluginName : "");
return MakeDirs(buffer, true) ? buffer : NULL;
}
@@ -122,8 +122,8 @@ cDll::~cDll()
delete plugin;
if (handle)
dlclose(handle);
- delete args;
- delete fileName;
+ free(args);
+ free(fileName);
}
static char *SkipQuote(char *s)
@@ -237,14 +237,14 @@ cPluginManager::cPluginManager(const char *Directory)
cPluginManager::~cPluginManager()
{
Shutdown();
- delete directory;
+ free(directory);
if (pluginManager == this)
pluginManager = NULL;
}
void cPluginManager::SetDirectory(const char *Directory)
{
- delete directory;
+ free(directory);
directory = Directory ? strdup(Directory) : NULL;
}
@@ -280,8 +280,8 @@ void cPluginManager::AddPlugin(const char *Args)
char *buffer = NULL;
asprintf(&buffer, "%s/%s%s%s%s", directory, LIBVDR_PREFIX, s, SO_INDICATOR, VDRVERSION);
dlls.Add(new cDll(buffer, Args));
- delete buffer;
- delete s;
+ free(buffer);
+ free(s);
}
bool cPluginManager::LoadPlugins(bool Log)