[PATCH] m68k: amiflop: *ptr incremented past 0x4489

[PATCH] m68k: amiflop: *ptr incremented past 0x4489

[Roel Kluin]

With while (*ptr++ != 0x4489) { ... } *ptr will be incremented past 0x4489 after
the loop.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 8df436f..3320b00 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -662,8 +662,8 @@ static unsigned long scan_sync(unsigned long raw, unsigned long end)
 {
 	ushort *ptr = (ushort *)raw, *endp = (ushort *)end;
 
-	while (ptr < endp && *ptr++ != 0x4489)
-		;
+	while (ptr < endp && *ptr != 0x4489)
+		++ptr;
 	if (ptr < endp) {
 		while (*ptr == 0x4489 && ptr < endp)
 			ptr++;

Re: [PATCH] m68k: amiflop: *ptr incremented past 0x4489

[Joerg Dorchain]

[-- Attachment #1: Type: text/plain, Size: 504 bytes --]

On Wed, Feb 11, 2009 at 03:42:54PM +0100, Roel Kluin wrote:
> With while (*ptr++ != 0x4489) { ... } *ptr will be incremented past 0x4489
> after
> the loop.

Yes, that is on purpose. The magic bytes of 0x4489 are a sync
mark, the interesting stuff always starts afterwards. The whole
decoding routing uses the current pointer the way that it always
points to the next unprocessed position when it arrives at the
next segment of decoding. I'd rather have this consistent in the
whole driver.

Bye,

Joerg

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]