[libdevice-cdio-perl] 01/02: Drop 04_wrong_handling_of_output_parameters.patch: we've not been able to find out what it was good for back in 2007, and it now causes at least one bug (Closes: #772005).

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch jessie
in repository libdevice-cdio-perl.

commit 6df3c4f3da430a8532b3c30bb5d22357fb07000f
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Dec 15 06:34:47 2014 +0000

    Drop 04_wrong_handling_of_output_parameters.patch: we've not been able to find out what it was good for back in 2007, and it now causes at least one bug (Closes: #772005).
---
 .../04_wrong_handling_of_output_parameters.patch   | 113 ---------------------
 debian/patches/series                              |   1 -
 2 files changed, 114 deletions(-)

diff --git a/debian/patches/04_wrong_handling_of_output_parameters.patch b/debian/patches/04_wrong_handling_of_output_parameters.patch
deleted file mode 100644
index 6aad2c5..0000000
--- a/debian/patches/04_wrong_handling_of_output_parameters.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Author: Martín Ferrari <martin.ferrari at gmail.com>
-Description: The return parameters handling was incorrect and resulted in weird
-behaviour. But it somehow passed the tests.
---- a/lib/Device/Cdio/ISO9660/FS.pm
-+++ b/lib/Device/Cdio/ISO9660/FS.pm
-@@ -116,9 +116,6 @@
- 
-     my @values = perliso9660::fs_find_lsn($self->{cd}, $lsn);
- 
--    # Remove the two input parameters
--    splice(@values, 0, 2) if @values > 2;
--
-     return Device::Cdio::ISO9660::stat_array_to_href(@values);
- }
- 
-@@ -179,9 +176,6 @@
- 
-     my @values = perliso9660::fs_readdir($self->{cd}, $dirname);
- 
--    # Remove the two input parameters
--    splice(@values, 0, 2) if @values > 2;
--
-     my @result = ();
-     while (@values) {
- 	push @result, Device::Cdio::ISO9660::stat_array_to_href(@values);
-@@ -294,9 +288,6 @@
- 	@values = perliso9660::fs_stat($self->{cd}, $path);
-     }
- 
--    # Remove the input parameters
--    splice(@values, 0, 2) if @values > 2;
--
-     return undef if !@values;
-     return Device::Cdio::ISO9660::stat_array_to_href(@values);
- }
---- a/lib/Device/Cdio/ISO9660/IFS.pm
-+++ b/lib/Device/Cdio/ISO9660/IFS.pm
-@@ -476,9 +476,6 @@
- 
-     my @values = perliso9660::ifs_readdir($self->{iso9660}, $dirname);
- 
--    # Remove the two input parameters
--    splice(@values, 0, 2) if @values > 2;
--
-     my @result = ();
-     while (@values) {
- 	push @result, Device::Cdio::ISO9660::stat_array_to_href(@values);
-@@ -612,9 +609,6 @@
- 	@values = perliso9660::ifs_stat($self->{iso9660}, $path);
-     }
- 
--    # Remove the input parameters
--    splice(@values, 0, 2) if @values > 2;
--
-     return undef if !@values;
-     return Device::Cdio::ISO9660::stat_array_to_href(@values);
- }
---- a/swig/perliso9660.swg
-+++ b/swig/perliso9660.swg
-@@ -97,12 +97,11 @@
- 
-  PPCODE:
-     /* Have perl compute the length of the string using strlen() */
--    XPUSHs(sv_2mortal(newSVpv(p_statbuf->filename, 0)));
--    XPUSHs(sv_2mortal(newSViv(p_statbuf->lsn)));
--    XPUSHs(sv_2mortal(newSViv(p_statbuf->size)));
--    XPUSHs(sv_2mortal(newSViv(p_statbuf->secsize)));
--    XPUSHs(sv_2mortal(newSViv(p_statbuf->type)));
--    argvi += 7;
-+    %append_output(sv_2mortal(newSVpv(p_statbuf->filename, 0)));
-+    %append_output(sv_2mortal(newSViv(p_statbuf->lsn)));
-+    %append_output(sv_2mortal(newSViv(p_statbuf->size)));
-+    %append_output(sv_2mortal(newSViv(p_statbuf->secsize)));
-+    %append_output(sv_2mortal(newSViv(p_statbuf->type)));
-     free (p_statbuf);
-  out: ;
- }
-@@ -111,30 +110,23 @@
-     // $1 is of type IsoStatList_t
-     CdioList_t *p_entlist   = result;
-     CdioListNode_t *p_entnode;
--    unsigned int num = 0;
- 
-     if (!result) goto out;
- 
-  PPCODE:
--    /* Figure out how many items in the array */
--    _CDIO_LIST_FOREACH (p_entnode, p_entlist) {
--      num +=5;
--    }
--
-     /* For each element in the array of strings, create a new
-      * mortalscalar, and stuff it into the above array. */
-     _CDIO_LIST_FOREACH (p_entnode, p_entlist) {
-       iso9660_stat_t *p_statbuf = 
- 	(iso9660_stat_t *) _cdio_list_node_data (p_entnode);
-       /* Have perl compute the length of the string using strlen() */
--      XPUSHs(sv_2mortal(newSVpv(p_statbuf->filename, 0)));
--      XPUSHs(sv_2mortal(newSViv(p_statbuf->lsn)));
--      XPUSHs(sv_2mortal(newSViv(p_statbuf->size)));
--      XPUSHs(sv_2mortal(newSViv(p_statbuf->secsize)));
--      XPUSHs(sv_2mortal(newSViv(p_statbuf->type)));
-+      %append_output(sv_2mortal(newSVpv(p_statbuf->filename, 0)));
-+      %append_output(sv_2mortal(newSViv(p_statbuf->lsn)));
-+      %append_output(sv_2mortal(newSViv(p_statbuf->size)));
-+      %append_output(sv_2mortal(newSViv(p_statbuf->secsize)));
-+      %append_output(sv_2mortal(newSViv(p_statbuf->type)));
-     }
-     _cdio_list_free (p_entlist, true);
--    argvi += num + 2;
-  out: ;
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 63051b3..ae6a8ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 02_wrong_function_name.patch
 03_version_information_in_swig.patch
-04_wrong_handling_of_output_parameters.patch
 05_tests-in-chroot.patch
 06_spelling.patch
 07_fix_perl_5.16_ftbfs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdevice-cdio-perl.git