Separate archiving and networking mode

1 files changed, 13 insertions, 13 deletions

diff --git a/zip/zip.cpp b/zip/zip.cpp
index 88f7ec9..8998d8b 100644
--- a/zip/zip.cpp
+++ b/zip/zip.cpp
@@ -1,5 +1,5 @@
 /*  ZIP plugin for Tux Commander
- *   version 0.5.5, designed for ZipArchive v3.2.0
+ *   version 0.5.6, designed for ZipArchive v3.2.0
  *  Copyright (C) 2008 Tomas Bzatek <tbzatek@users.sourceforge.net>
  *   Check for updates on tuxcmd.sourceforge.net
  *
@@ -47,8 +47,8 @@
 
 
 
-#define VERSION "0.5.5"
-#define BUILD_DATE "2009-10-24"
+#define VERSION "0.5.6"
+#define BUILD_DATE "2009-10-25"
 #define DEFAULT_BLOCK_SIZE 65536
 
 
@@ -312,7 +312,7 @@ VFSGetArchiveExts()
 /**************************************************************************************************************************************/
 /**************************************************************************************************************************************/
 
-TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
+TVFSResult VFSOpenArchive(struct TVFSGlobs *globs, char *sName)
 {
   //  Initialize the objects
   globs->files = NULL;
@@ -323,30 +323,30 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
 
   try
   {
-    fprintf(stderr, "(--) VFSOpen: trying to open the file...\n");
+    fprintf(stderr, "(--) VFSOpenArchive: trying to open the file...\n");
 
     try {
       if (! globs->zip->Open(sName, CZipArchive::zipOpen, 0)) {
-          printf("(EE) VFSOpen: error opening zip archive\n");
+          printf("(EE) VFSOpenArchive: error opening zip archive\n");
           return cVFS_Failed;
       }
     }
     catch (...) {
-      printf("(!!) VFSOpen: error opening readwrite zip, trying readonly...\n");
+      printf("(!!) VFSOpenArchive: error opening readwrite zip, trying readonly...\n");
       try {
         // try to open in read only mode (required if there's no write access on the media)
         if (! globs->zip->Open(sName, CZipArchive::zipOpenReadOnly, 0)) {
-            printf("(EE) VFSOpen: error opening readonly zip archive\n");
+            printf("(EE) VFSOpenArchive: error opening readonly zip archive\n");
             return cVFS_Failed;
         }
       }
       catch (...) {
-        printf("(EE) VFSOpen: error opening readonly zip\n");
+        printf("(EE) VFSOpenArchive: error opening readonly zip\n");
         return cVFS_Failed;
       }
     }
     int iCount = globs->zip->GetCount(false);
-    printf("(II) VFSOpen: %i records found, %i files.\n", iCount, globs->zip->GetCount(true));
+    printf("(II) VFSOpenArchive: %i records found, %i files.\n", iCount, globs->zip->GetCount(true));
     if (iCount < 1) return cVFS_Failed;
 
     //  Build the global file list
@@ -362,14 +362,14 @@ TVFSResult VFSOpen(struct TVFSGlobs *globs, char *sName)
     globs->zip->SetAutoFlush(true);
   }
   catch (CZipException e) {
-    printf ("(EE) VFSOpen: Error while processing archive %s\n%s\n", (LPCTSTR) sName, (LPCTSTR)e.GetErrorDescription());
+    printf ("(EE) VFSOpenArchive: Error while processing archive %s\n%s\n", (LPCTSTR) sName, (LPCTSTR)e.GetErrorDescription());
     if (e.m_szFileName.IsEmpty()) printf("\n");
-    else printf("(EE) VFSOpen: Filename in error object: %s\n\n", (LPCTSTR)e.m_szFileName);
+    else printf("(EE) VFSOpenArchive: Filename in error object: %s\n\n", (LPCTSTR)e.m_szFileName);
     globs->zip->Close(true);
     return cVFS_Failed;
   }
   catch (...) {
-    printf ("(EE) VFSOpen: Unknown error while processing archive %s\n\n", (LPCTSTR) sName);
+    printf ("(EE) VFSOpenArchive: Unknown error while processing archive %s\n\n", (LPCTSTR) sName);
     globs->zip->Close(true);
     return cVFS_Failed;
   }