summaryrefslogtreecommitdiff
path: root/src/export
diff options
context:
space:
mode:
authorDirk Engling <erdgeist@erdgeist.org>2015-05-14 02:42:19 +0200
committerDirk Engling <erdgeist@erdgeist.org>2015-05-14 02:42:19 +0200
commitdc125c4db8e50abf68132748acfd0ba1b2e09fad (patch)
tree6adad0c55489fbdbaf041d376ab692cd76927204 /src/export
parent19b16fb2b5af35c337209c6f59ea67a5b97c493e (diff)
Fix up differences in version no/sw
Diffstat (limited to 'src/export')
-rw-r--r--src/export/split_version_2.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/export/split_version_2.c b/src/export/split_version_2.c
index e886454..d3018dd 100644
--- a/src/export/split_version_2.c
+++ b/src/export/split_version_2.c
@@ -52,9 +52,9 @@
52enum { g_outfiles = 17 }; 52enum { g_outfiles = 17 };
53static enum { CD_NO = 0, CD_S = 1, CD_W = 2 } g_cd; 53static enum { CD_NO = 0, CD_S = 1, CD_W = 2 } g_cd;
54static int g_outfilemap[3][29] = { 54static int g_outfilemap[3][29] = {
55 {-1,-1,-1, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,14, 5,-1,16, 6,13,12, 8,10, 3, 9,-1, 7,11 }, 55 {-1,-1,-1, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,14, 6,-1,16, 5,13,12, 8,10, 3, 9,-1,-1, 7,11 },
56 {-1,-1,-1, 0,-1,-1,-1,-1,-1,-1,-1,-1,11,-1, 6, 5,-1,-1,16, 8,10,14, 3, 9,13,12, 7,11 }, 56 {-1,-1,-1, 0,-1,-1,-1,-1,-1,-1,-1,-1,11,-1, 6, 5,-1,-1,16, 8,10,14, 3, 9,13,-1,12, 7,11 },
57 {-1,-1,-1, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,13, 6,16, 5, 8,10, 3, 9,12,-1,14, 7,11 } 57 {-1,-1,-1, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,13, 6,16, 5, 8,10, 3, 9,12,-1,-1,14, 7,11 }
58}; 58};
59 59
60static struct { 60static struct {
@@ -115,9 +115,7 @@ static void dump_primary( uint8_t *end, uint32_t flags ) {
115 dump_string( end, 1, 0 ); 115 dump_string( end, 1, 0 );
116 actually the entry is dumped in the caller when we know 116 actually the entry is dumped in the caller when we know
117 if this is the first line of a continuation. 117 if this is the first line of a continuation.
118 Here we just skip the byte:
119 */ 118 */
120 --end;
121 119
122 /* Dump first 5 chars of zip, they're always there */ 120 /* Dump first 5 chars of zip, they're always there */
123 dump_string( end -= 5, 5, 1 ); 121 dump_string( end -= 5, 5, 1 );
@@ -136,18 +134,18 @@ static void dump_primary( uint8_t *end, uint32_t flags ) {
136 if( g_cd != CD_NO ) 134 if( g_cd != CD_NO )
137 dump_string( end -= 5, 5, 5 ); 135 dump_string( end -= 5, 5, 5 );
138 else 136 else
139 dump_field( &end, 5 ); 137 dump_field( &end, 6 );
140 } 138 }
141 139
142 if( flags & 0x0010 ) dump_field( &end, 6 ); 140 if( flags & 0x0010 ) dump_field( &end, g_cd == CD_NO ? 5 : 6 );
143 if( flags & 0x0008 ) dump_field( &end, 7 ); 141 if( flags & 0x0008 ) dump_field( &end, 7 );
144 if( flags & 0x0004 ) dump_field( &end, 8 ); 142 if( flags & 0x0004 ) dump_field( &end, 8 );
145 if( flags & 0x0002 ) dump_field( &end, 9 ); 143 if( flags & 0x0002 ) dump_field( &end, 9 );
146 if( flags & 0x0001 ) dump_field( &end, 10 ); 144 if( flags & 0x0001 ) dump_field( &end, 10 );
147 if( flags & 0x8000 ) dump_field( &end, 11 ); 145 if( flags & 0x8000 ) dump_field( &end, 11 );
148 if( flags & 0x4000 ) dump_field( &end, 12 ); 146 if( flags & 0x4000 ) dump_field( &end, 12 );
149 if( flags & 0x2000 ) dump_field( &end, 13 ); 147 if( flags & 0x2000 ) dump_field( &end, g_cd == CD_NO ? 13 : 14 );
150 if( flags & 0x1000 ) dump_field( &end, 14 ); 148 if( flags & 0x1000 ) dump_field( &end, g_cd == CD_NO ? 14 : 13 );
151 149
152 dump_field( &end, 15 ); 150 dump_field( &end, 15 );
153 151