Files
haikuports/media-libs/libbdplus/patches/libbdplus-0.1.2.patchset
Jérôme Duval 3586104e52 libbdplus: remove libtool file.
* fix use of reserved name index.
2016-12-07 17:35:58 +01:00

50 lines
1.7 KiB
Plaintext

From f3c73966a3089e96e14f2138f72482fcd7ca3c8f Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 7 Dec 2016 15:35:35 +0000
Subject: index is reserved.
diff --git a/src/examples/convtab_dump.c b/src/examples/convtab_dump.c
index 3a55a26..e1e55a5 100644
--- a/src/examples/convtab_dump.c
+++ b/src/examples/convtab_dump.c
@@ -29,7 +29,7 @@
// raw table
#define MAX_TAB_SIZE 64*1024*1024
uint8_t tab[MAX_TAB_SIZE];
-uint32_t index[0xffff];
+uint32_t index_table[0xffff];
static size_t _read_tab(const char *file)
{
@@ -97,9 +97,9 @@ int main(int argc, char **argv)
printf(" Segment %d: %d entries\n", segment, numEntries);
- // read index table
+ // read index_table table
for (entry = 0; entry < numEntries; entry++) {
- index[entry] = FETCH4(&tab[offset]);
+ index_table[entry] = FETCH4(&tab[offset]);
offset += 4;
}
@@ -125,12 +125,12 @@ int main(int argc, char **argv)
memcpy(patch1, &tab[ offset ], sizeof(patch1));
offset += 5;
- uint64_t off0 = (( (uint64_t)index[entry] +
+ uint64_t off0 = (( (uint64_t)index_table[entry] +
(uint64_t)patch0_address_adjust) *
(uint64_t)0xC0 +
(uint64_t)patch0_buffer_offset);
- uint64_t off1 = (( (uint64_t)index[entry] +
+ uint64_t off1 = (( (uint64_t)index_table[entry] +
(uint64_t)patch0_address_adjust +
(uint64_t)patch1_address_adjust) *
(uint64_t)0xC0 +
--
2.10.2