@@ -319,12 +319,11 @@ count = buffer[1]; if (length < count + 2) @throw [OFTruncatedDataException exception]; - *object = [OFData dataWithItems: buffer + 2 - count: count]; + *object = [OFData dataWithItems: buffer + 2 count: count]; return count + 2; case 0xC5: /* bin 16 */ if (length < 3) @throw [OFTruncatedDataException exception]; @@ -332,12 +331,11 @@ count = readUInt16(buffer + 1); if (length < count + 3) @throw [OFTruncatedDataException exception]; - *object = [OFData dataWithItems: buffer + 3 - count: count]; + *object = [OFData dataWithItems: buffer + 3 count: count]; return count + 3; case 0xC6: /* bin 32 */ if (length < 5) @throw [OFTruncatedDataException exception]; @@ -345,12 +343,11 @@ count = readUInt32(buffer + 1); if (length < count + 5) @throw [OFTruncatedDataException exception]; - *object = [OFData dataWithItems: buffer + 5 - count: count]; + *object = [OFData dataWithItems: buffer + 5 count: count]; return count + 5; /* Extensions */ case 0xC7: /* ext 8 */ if (length < 3) @@ -359,12 +356,11 @@ count = buffer[1]; if (length < count + 3) @throw [OFTruncatedDataException exception]; - data = [[OFData alloc] initWithItems: buffer + 3 - count: count]; + data = [[OFData alloc] initWithItems: buffer + 3 count: count]; @try { *object = createExtension(buffer[2], data); } @finally { [data release]; } @@ -377,12 +373,11 @@ count = readUInt16(buffer + 1); if (length < count + 4) @throw [OFTruncatedDataException exception]; - data = [[OFData alloc] initWithItems: buffer + 4 - count: count]; + data = [[OFData alloc] initWithItems: buffer + 4 count: count]; @try { *object = createExtension(buffer[3], data); } @finally { [data release]; } @@ -395,12 +390,11 @@ count = readUInt32(buffer + 1); if (length < count + 6) @throw [OFTruncatedDataException exception]; - data = [[OFData alloc] initWithItems: buffer + 6 - count: count]; + data = [[OFData alloc] initWithItems: buffer + 6 count: count]; @try { *object = createExtension(buffer[5], data); } @finally { [data release]; } @@ -408,12 +402,11 @@ return count + 6; case 0xD4: /* fixext 1 */ if (length < 3) @throw [OFTruncatedDataException exception]; - data = [[OFData alloc] initWithItems: buffer + 2 - count: 1]; + data = [[OFData alloc] initWithItems: buffer + 2 count: 1]; @try { *object = createExtension(buffer[1], data); } @finally { [data release]; } @@ -421,12 +414,11 @@ return 3; case 0xD5: /* fixext 2 */ if (length < 4) @throw [OFTruncatedDataException exception]; - data = [[OFData alloc] initWithItems: buffer + 2 - count: 2]; + data = [[OFData alloc] initWithItems: buffer + 2 count: 2]; @try { *object = createExtension(buffer[1], data); } @finally { [data release]; } @@ -434,12 +426,11 @@ return 4; case 0xD6: /* fixext 4 */ if (length < 6) @throw [OFTruncatedDataException exception]; - data = [[OFData alloc] initWithItems: buffer + 2 - count: 4]; + data = [[OFData alloc] initWithItems: buffer + 2 count: 4]; @try { *object = createExtension(buffer[1], data); } @finally { [data release]; } @@ -447,12 +438,11 @@ return 6; case 0xD7: /* fixext 8 */ if (length < 10) @throw [OFTruncatedDataException exception]; - data = [[OFData alloc] initWithItems: buffer + 2 - count: 8]; + data = [[OFData alloc] initWithItems: buffer + 2 count: 8]; @try { *object = createExtension(buffer[1], data); } @finally { [data release]; } @@ -460,12 +450,11 @@ return 10; case 0xD8: /* fixext 16 */ if (length < 18) @throw [OFTruncatedDataException exception]; - data = [[OFData alloc] initWithItems: buffer + 2 - count: 16]; + data = [[OFData alloc] initWithItems: buffer + 2 count: 16]; @try { *object = createExtension(buffer[1], data); } @finally { [data release]; }