zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module.

Commit message:
-Replaced open functions with old ones to make it work with Macports

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module.

=== modified file 'src/archive_module.xq.src/archive_module.cpp'
--- src/archive_module.xq.src/archive_module.cpp	2012-09-18 21:44:28 +0000
+++ src/archive_module.xq.src/archive_module.cpp	2013-01-16 22:18:22 +0000
@@ -919,15 +919,7 @@
         base64::attach(*theData.theStream);
       }
 
-	    lErr = archive_read_set_read_callback(
-        theArchive, ArchiveItemSequence::readStream);
-      ArchiveFunction::checkForError(lErr, 0, theArchive);
-
-      lErr = archive_read_set_callback_data(
-        theArchive, &theData);
-      ArchiveFunction::checkForError(lErr, 0, theArchive);
-
-      lErr = archive_read_open1(theArchive);
+      lErr = archive_read_open(theArchive, &theData, NULL, ArchiveItemSequence::readStream, NULL);
       ArchiveFunction::checkForError(lErr, 0, theArchive);
     }
     else
@@ -1515,7 +1507,6 @@
     //updated with the new Files specified
     ArchiveCompressor lResArchive;
     ArchiveOptions lOptions;
-    bool lHasItem = false;
 
     Item lItem;
     Iterator_t lSeqIter = lSeq->getIterator();
@@ -1523,13 +1514,12 @@
     //read first header and file of the archive so we can get the options before creating 
     //the new archive.
     lSeqIter->open();
-    lHasItem = lSeqIter->next(lItem);
+    lSeqIter->next(lItem);
     //set the options of the archive
     lOptions = lSeq->getOptions();
     //create new archive with the options read
     lResArchive.open(lOptions);
-    //if (!lItem.isNull())
-    if (lHasItem)
+    if (!lItem.isNull())
     {
       do 
       {