Package: mol-drivers-linux
Version: 0.9.70+1-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my mol-drivers-linux 0.9.70+1-1.1 NMU.
--
Homepage: http://www.sesse.net/
--- mol-drivers-linux-0.9.70+1/debian/changelog
+++ mol-drivers-linux-0.9.70+1/debian/changelog
@@ -1,3 +1,10 @@
+mol-drivers-linux (0.9.70+1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove usage of removed lvalue-as-cast gcc extension. (Closes: #362407)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Sat, 3 Jun 2006 20:53:40 +0000
+
mol-drivers-linux (0.9.70+1-1) unstable; urgency=low
* New upstream release, mainly with an up-to-date build system.
only in patch2:
unchanged:
--- mol-drivers-linux-0.9.70+1.orig/src/fs/hfsplus/include/swab.h
+++ mol-drivers-linux-0.9.70+1/src/fs/hfsplus/include/swab.h
@@ -25,9 +25,9 @@
/* Big endian */
-#define bswabU16_inc(ptr) (*((UInt16*) (ptr))++)
-#define bswabU32_inc(ptr) (*((UInt32*) (ptr))++)
-#define bswabU64_inc(ptr) (*((UInt64*) (ptr))++)
+#define bswabU16_inc(ptr) ({ UInt16* tmp = (UInt16*) (ptr); ptr = tmp + 1;
*tmp; })
+#define bswabU32_inc(ptr) ({ UInt32* tmp = (UInt32*) (ptr); ptr = tmp + 1;
*tmp; })
+#define bswabU64_inc(ptr) ({ UInt64* tmp = (UInt64*) (ptr); ptr = tmp + 1;
*tmp; })
#define bstoreU16_inc(ptr, val) (*((UInt16*) (ptr))++) = val
#define bstoreU32_inc(ptr, val) (*((UInt32*) (ptr))++) = val
@@ -35,5 +35,5 @@
/* for the sake of compleetness and readability */
-#define bswabU8_inc(ptr) (*((UInt8*) (ptr))++)
+#define bswabU8_inc(ptr) ({ UInt8* tmp = (UInt8*) (ptr); ptr = tmp + 1;
*tmp; })
#define bstoreU8_inc(ptr,val) (*((UInt8*) (ptr))++) = val
only in patch2:
unchanged:
--- mol-drivers-linux-0.9.70+1.orig/src/fs/hfsplus/btree.c
+++ mol-drivers-linux-0.9.70+1/src/fs/hfsplus/btree.c
@@ -70,8 +70,7 @@
head->reserved2 = bswabU8_inc(p);
head->attributes = bswabU32_inc(p);
// skip reserved bytes
- ((UInt32*) p) += 16;
- return p;
+ return ((UInt32*)p) + 16;
}
/* Priority of the depth of the node compared to LRU value.
only in patch2:
unchanged:
--- mol-drivers-linux-0.9.70+1.orig/src/fs/hfsplus/record.c
+++ mol-drivers-linux-0.9.70+1/src/fs/hfsplus/record.c
@@ -149,7 +149,7 @@
static inline void* record_readFXInfo(void *p, FXInfo* xinfo)
{
xinfo->fdIconID = bswabU16_inc(p);
- ((SInt16*) p) += 4; // skip unused
+ p = ((SInt16*) p) + 4; // skip unused
xinfo->fdComment = bswabU16_inc(p);
xinfo->fdPutAway = bswabU32_inc(p);
return p;
only in patch2:
unchanged:
--- mol-drivers-linux-0.9.70+1.orig/src/fs/hfsplus/volume.c
+++ mol-drivers-linux-0.9.70+1/src/fs/hfsplus/volume.c
@@ -140,7 +140,7 @@
vh->write_count = bswabU32_inc(p);
vh->encodings_bmp = bswabU64_inc(p);
memcpy(vh->finder_info, p, 32);
- ((char*) p) += 32; // So finderinfo must be swapped later, ***
+ p = ((char*) p) + 32; // So finderinfo must be swapped later, ***
p = volume_readfork(p, &vh->alloc_file );
p = volume_readfork(p, &vh->ext_file );
p = volume_readfork(p, &vh->cat_file );
@@ -180,12 +180,12 @@
UInt16 drAlBlSt; /* first allocation
block in volume */
UInt16 embeds, embedl; /* Start/lenght of
embedded area in blocks */
- ((char*) p) += 0x12; /* skip unneded HFS vol
fields */
+ p = ((char*) p) + 0x12; /* skip unneded HFS vol
fields */
drAlBlkSiz = bswabU32_inc(p); /* offset 0x14 */
- ((char*) p) += 0x4; /* skip unneded HFS vol
fields */
+ p = ((char*) p) + 0x4; /* skip unneded HFS vol
fields */
drAlBlSt = bswabU16_inc(p); /* offset 0x1C */
- ((char*) p) += 0x5E; /* skip unneded HFS vol
fields */
+ p = ((char*) p) + 0x5E; /* skip unneded HFS vol
fields */
signature = bswabU16_inc(p); /* offset 0x7C,
drEmbedSigWord */
if( signature != HFSP_VOLHEAD_SIG)
HFSP_ERROR(-1, "This looks like a normal HFS volume");
