On 11/15/2014 08:25 AM, Christian Resell wrote:
Simple style fix ("else is not generally useful after a break or return").
For the eudyptula challenge (http://eudyptula-challenge.org/).
Signed-off-by: Christian F. Resell <christian.resell@xxxxxxxxx>
---
This patch leads to the following build warnings:
CC [M] drivers/staging/rtl8712/rtl871x_security.o
In file included from drivers/staging/rtl8712/osdep_service.h:43:0,
from drivers/staging/rtl8712/rtl871x_security.c:45:
drivers/staging/rtl8712/rtl871x_security.c: In function ‘crc32_init’:
drivers/staging/rtl8712/basic_types.h:35:14: warning: ISO C90 forbids mixed
declarations and code [-Wdeclaration-after-statement]
#define sint signed int
^
drivers/staging/rtl8712/rtl871x_security.c:129:2: note: in expansion of macro ‘sint’
sint i, j;
^
The previous code had braces around the code in question. Either you need to
leave those braces, or you need to move the declarations.
Please compile test your patches!
Larry
diff --git a/drivers/staging/rtl8712/rtl871x_security.c b/drivers/staging/rtl8712/rtl871x_security.c
index c653ad6..cc3a446 100644
--- a/drivers/staging/rtl8712/rtl871x_security.c
+++ b/drivers/staging/rtl8712/rtl871x_security.c
@@ -126,26 +126,24 @@ static void crc32_init(void)
{
if (bcrc32initialized == 1)
return;
- else {
- sint i, j;
- u32 c;
- u8 *p = (u8 *)&c, *p1;
- u8 k;
-
- c = 0x12340000;
- for (i = 0; i < 256; ++i) {
- k = crc32_reverseBit((u8)i);
- for (c = ((u32)k) << 24, j = 8; j > 0; --j)
- c = c & 0x80000000 ? (c << 1) ^ CRC32_POLY :
- (c << 1);
- p1 = (u8 *)&crc32_table[i];
- p1[0] = crc32_reverseBit(p[3]);
- p1[1] = crc32_reverseBit(p[2]);
- p1[2] = crc32_reverseBit(p[1]);
- p1[3] = crc32_reverseBit(p[0]);
- }
- bcrc32initialized = 1;
+ sint i, j;
+ u32 c;
+ u8 *p = (u8 *)&c, *p1;
+ u8 k;
+
+ c = 0x12340000;
+ for (i = 0; i < 256; ++i) {
+ k = crc32_reverseBit((u8)i);
+ for (c = ((u32)k) << 24, j = 8; j > 0; --j)
+ c = c & 0x80000000 ? (c << 1) ^ CRC32_POLY :
+ (c << 1);
+ p1 = (u8 *)&crc32_table[i];
+ p1[0] = crc32_reverseBit(p[3]);
+ p1[1] = crc32_reverseBit(p[2]);
+ p1[2] = crc32_reverseBit(p[1]);
+ p1[3] = crc32_reverseBit(p[0]);
}
+ bcrc32initialized = 1;
}
static u32 getcrc32(u8 *buf, u32 len)
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
