[Jython-checkins] SF.net SVN: jython:[5172] branches/asm/src/org/python/modules/struct.java

[<pj...@us...>]

Revision: 5172
          http://jython.svn.sourceforge.net/jython/?rev=5172&view=rev
Author:   pjenvey
Date:     2008-08-13 23:35:12 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
fix alignment of little and big endian long longs. caused extra padding which
broke test_zipfile zip64 tests

Modified Paths:
--------------
    branches/asm/src/org/python/modules/struct.java

Modified: branches/asm/src/org/python/modules/struct.java
===================================================================
--- branches/asm/src/org/python/modules/struct.java	2008-08-13 19:48:08 UTC (rev 5171)
+++ branches/asm/src/org/python/modules/struct.java	2008-08-13 23:35:12 UTC (rev 5172)
@@ -828,8 +828,8 @@
         new LEUnsignedIntFormatDef()    .init('I', 4, 0),
         new LEIntFormatDef()            .init('l', 4, 0),
         new LEUnsignedIntFormatDef()    .init('L', 4, 0),
-        new LELongFormatDef()           .init('q', 8, 8),
-        new LEUnsignedLongFormatDef()   .init('Q', 8, 8),
+        new LELongFormatDef()           .init('q', 8, 0),
+        new LEUnsignedLongFormatDef()   .init('Q', 8, 0),
         new LEFloatFormatDef()          .init('f', 4, 0),
         new LEDoubleFormatDef()         .init('d', 8, 0),
     };
@@ -847,8 +847,8 @@
         new BEUnsignedIntFormatDef()    .init('I', 4, 0),
         new BEIntFormatDef()            .init('l', 4, 0),
         new BEUnsignedIntFormatDef()    .init('L', 4, 0),
-        new BELongFormatDef()           .init('q', 8, 8),
-        new BEUnsignedLongFormatDef()   .init('Q', 8, 8),
+        new BELongFormatDef()           .init('q', 8, 0),
+        new BEUnsignedLongFormatDef()   .init('Q', 8, 0),
         new BEFloatFormatDef()          .init('f', 4, 0),
         new BEDoubleFormatDef()         .init('d', 8, 0),
     };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.