Consolidate VFS memory managementv0.6.66

1 files changed, 20 insertions, 20 deletions

diff --git a/zip/zip.cpp b/zip/zip.cpp
index aef7f5f..f848a77 100644
--- a/zip/zip.cpp
+++ b/zip/zip.cpp
@@ -259,7 +259,7 @@ VFSNew (TVFSLogFunc log_func)
   globs->callback_progress = NULL;
 
   globs->log_func = log_func;
-  if (globs->log_func != NULL) globs->log_func((char*)"zip plugin: VFSInit");
+  if (globs->log_func != NULL) globs->log_func("zip plugin: VFSInit");
 
   return globs;
 }
@@ -280,7 +280,7 @@ VFSSetCallbacks (struct TVFSGlobs *globs,
 void
 VFSFree (struct TVFSGlobs *globs)
 {
-  if (globs->log_func != NULL) globs->log_func((char*)"zip plugin: VFSDestroy");
+  if (globs->log_func != NULL) globs->log_func("zip plugin: VFSDestroy");
   free (globs);
 }
 
@@ -289,30 +289,29 @@ int VFSVersion()
   return cVFSVersion;
 }
 
-TVFSInfo VFSGetInfo()
+struct TVFSInfo *
+VFSGetInfo()
 {
-  TVFSInfo module_info;
-  module_info.ID = "zip_plugin";
-  module_info.Name = "ZIP plugin";
-  char *s = (char*)malloc(255);
-  snprintf(s, 255, "version %s, build date: %s\nusing ZipArchive library v%s\n", VERSION, BUILD_DATE, CZipArchive::m_gszVersion);
-  module_info.About = strdup(s);
-  free(s);
-  s = (char*)malloc(255);
-  snprintf(s, 255, "Plugin Copyright (C) 2004-2009 Tomáš Bžatek\n%s", CZipArchive::m_gszCopyright);
-  module_info.Copyright = strdup(s);
+  struct TVFSInfo *module_info = (TVFSInfo*) g_malloc0 (sizeof (struct TVFSInfo));
+
+  module_info->ID = g_strdup ("zip_plugin");
+  module_info->Name = g_strdup ("ZIP plugin");
+  module_info->About = g_strdup_printf ("version %s, build date: %s\nusing ZipArchive library v%s\n", VERSION, BUILD_DATE, CZipArchive::m_gszVersion);
+  module_info->Copyright = g_strdup_printf ("Plugin Copyright (C) 2004-2009 Tomáš Bžatek\n%s", CZipArchive::m_gszCopyright);
+
   return module_info;
 }
 
-char *VFSGetPrefix(struct TVFSGlobs *globs)
+char *
+VFSGetPrefix (struct TVFSGlobs *globs)
 {
-//  return "zip";
-  return globs->archive_path;
+  return g_strdup (globs->archive_path);
 }
 
-char *VFSGetExts()
+char *
+VFSGetExts()
 {
-  return (char*)"zip";
+  return g_strdup ("zip");
 }
 
 
@@ -427,9 +426,10 @@ TVFSResult VFSClose(struct TVFSGlobs *globs)
   return cVFS_OK;
 }
 
-char *VFSGetPath(struct TVFSGlobs *globs)
+char *
+VFSGetPath (struct TVFSGlobs *globs)
 {
-  return globs->curr_dir;
+  return g_strdup (globs->curr_dir);
 }
 
 u_int64_t VFSGetFileSystemFree(struct TVFSGlobs *globs, char *APath)