diff options
| author | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2009-10-04 16:30:10 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2009-10-04 16:30:10 +0200 |
| commit | 7baf84f22bcf68f0c4a14a5ff404119aafe2666a (patch) | |
| tree | 260be56a2da98ab48a2cc6d7ddbb36b4adbe3074 /unrar | |
| parent | 88ce42250dc9cd1b69eb734b88226a5bd408c4d5 (diff) | |
| download | tuxcmd-modules-7baf84f22bcf68f0c4a14a5ff404119aafe2666a.tar.xz | |
Consolidate VFS memory managementv0.6.66
Diffstat (limited to 'unrar')
| -rw-r--r-- | unrar/unrar.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/unrar/unrar.c b/unrar/unrar.c index 97d748c..5f34923 100644 --- a/unrar/unrar.c +++ b/unrar/unrar.c @@ -120,7 +120,7 @@ VFSNew (TVFSLogFunc log_func) globs->callback_progress = NULL; globs->log_func = log_func; - if (globs->log_func != NULL) globs->log_func((char*)"unrar plugin: VFSInit"); + if (globs->log_func != NULL) globs->log_func("unrar plugin: VFSInit"); return globs; } @@ -141,7 +141,7 @@ VFSSetCallbacks (struct TVFSGlobs *globs, void VFSFree (struct TVFSGlobs *globs) { - if (globs->log_func != NULL) globs->log_func((char*)"unrar plugin: VFSDestroy"); + if (globs->log_func != NULL) globs->log_func("unrar plugin: VFSDestroy"); free (globs); } @@ -150,31 +150,30 @@ int VFSVersion() return cVFSVersion; } -struct TVFSInfo VFSGetInfo() +struct TVFSInfo * +VFSGetInfo() { - struct TVFSInfo module_info; - module_info.ID = "unrar_plugin"; - module_info.Name = "UNRAR plugin"; - char *s = (char*)malloc(255); - snprintf(s, 255, "version %s, build date: %s\nusing unrar sources v%d.%d [%d-%.2d-%.2d]\n", - VERSION, BUILD_DATE, RARVER_MAJOR, RARVER_MINOR, RARVER_YEAR, RARVER_MONTH, RARVER_DAY); - module_info.About = strdup(s); - free(s); - s = (char*)malloc(255); - snprintf(s, 255, "Plugin Copyright (C) 2007-2009 Tomáš Bžatek\nUNRAR sources Copyright (C) 2002-2008 Alexander Roshal"); - module_info.Copyright = strdup(s); + struct TVFSInfo *module_info = g_malloc0 (sizeof (struct TVFSInfo)); + + module_info->ID = g_strdup ("unrar_plugin"); + module_info->Name = g_strdup ("UNRAR plugin"); + module_info->About = g_strdup_printf ("version %s, build date: %s\nusing unrar sources v%d.%d [%d-%.2d-%.2d]\n", + VERSION, BUILD_DATE, RARVER_MAJOR, RARVER_MINOR, RARVER_YEAR, RARVER_MONTH, RARVER_DAY); + module_info->Copyright = g_strdup ("Plugin Copyright (C) 2007-2009 Tomáš Bžatek\nUNRAR sources Copyright (C) 2002-2008 Alexander Roshal"); + return module_info; } -char *VFSGetPrefix(struct TVFSGlobs *globs) +char * +VFSGetPrefix (struct TVFSGlobs *globs) { - return globs->archive_path; -// return (char*)"unrar"; + return g_strdup (globs->archive_path); } -char *VFSGetExts() +char * +VFSGetExts () { - return (char*)"rar;r00;r01;r02;r03;r04;r05;r06;r07;r08;r09;r10;r11;r12;r13;r14;r15;r16;r17;r18;r19;r20;r21;r22;r23;r24;r25;r26;r27;r28;r29;r30;r31;r32;r33;r34;r35;r36;r37;r38;r39;r40;r41;r42;r43;r44;r45;r46;r47;r48;r49;r50;r51;r52;r53;r54;r55;r56;r57;r58;r59;r60;r61;r62;r63;r64;r65;r66;r67;r68;r69;r70;r71;r72;r73;r74;r75;r76;r77;r78;r79;r80;r81;r82;r83;r84;r85;r86;r87;r88;r89;r90;r91;r92;r93;r94;r95;r96;r97;r98;r99"; + return g_strdup ("rar;r00;r01;r02;r03;r04;r05;r06;r07;r08;r09;r10;r11;r12;r13;r14;r15;r16;r17;r18;r19;r20;r21;r22;r23;r24;r25;r26;r27;r28;r29;r30;r31;r32;r33;r34;r35;r36;r37;r38;r39;r40;r41;r42;r43;r44;r45;r46;r47;r48;r49;r50;r51;r52;r53;r54;r55;r56;r57;r58;r59;r60;r61;r62;r63;r64;r65;r66;r67;r68;r69;r70;r71;r72;r73;r74;r75;r76;r77;r78;r79;r80;r81;r82;r83;r84;r85;r86;r87;r88;r89;r90;r91;r92;r93;r94;r95;r96;r97;r98;r99"); } @@ -454,9 +453,10 @@ TVFSResult VFSClose(struct TVFSGlobs *globs) return cVFS_OK; } -char *VFSGetPath(struct TVFSGlobs *globs) +char * +VFSGetPath (struct TVFSGlobs *globs) { - return include_trailing_path_sep(globs->curr_dir); + return include_trailing_path_sep (globs->curr_dir); } u_int64_t VFSGetFileSystemFree(struct TVFSGlobs *globs, char *APath) |