Skip to contentSkip to conversation

Some cleanup patches for: '...lvalues is deprecated'

PATCH Joel Soete 1 participant 1 message Jun 30, 2004

Subsystems (4)
lore
Share & tools
lore

Joel Soete

author
#0 lore raw

---------------------------------------------------------------------------
NEW: Tiscali ADSL LIGHT, 28,95 EUR/mois, c'est le moment de faire le pas!
http://reg.tiscali.be/default.asp?lg=fr

Hi Marcelo,

Here are some backport to clean up some warning of type: use of cast experssion as lvalues is deprecated.
--- linux-2.4.27-rc2-pa4mm/kernel/sysctl.c.Orig 2004-06-29 09:03:42.000000000
+0200
+++ linux-2.4.27-rc2-pa4mm/kernel/sysctl.c 2004-06-29 10:10:31.588030256
+0200
@@ -890,7 +890,7 @@
if (!isspace(c))
break;
left--;
- ((char *) buffer)++;
+ buffer += sizeof(char);
}
if (!left)
break;
@@ -1043,7 +1043,7 @@
if (!isspace(c))
break;
left--;
- ((char *) buffer)++;
+ buffer += sizeof(char);
}
if (!left)
break;
@@ -1144,7 +1144,7 @@
if (!isspace(c))
break;
left--;
- ((char *) buffer)++;
+ buffer += sizeof(char);
}
if (!left)
break;
=========><=========
--- linux-2.4.27-rc2-pa4mm/fs/readdir.c.Orig 2004-06-29 11:18:46.636488264
+0200
+++ linux-2.4.27-rc2-pa4mm/fs/readdir.c 2004-06-29 11:25:40.281604648 +0200
@@ -264,7 +264,7 @@
put_user(reclen, &dirent->d_reclen); copy_to_user(dirent->d_name, name, namlen);
put_user(0, dirent->d_name + namlen);
- ((char *) dirent) += reclen;
+ dirent = (void *)dirent + reclen;
buf->current_dir = dirent;
buf->count -= reclen;
return 0;
@@ -347,7 +347,7 @@
copy_to_user(dirent, &d, NAME_OFFSET(&d)); copy_to_user(dirent->d_name, name, namlen);
put_user(0, dirent->d_name + namlen);
- ((char *) dirent) += reclen;
+ dirent = (void *)dirent + reclen;
buf->current_dir = dirent;
buf->count -= reclen;
return 0;
=========><=========
--- linux-2.4.27-rc2-pa4mm/drivers/video/fbcon.c.Orig 2004-06-29 10:47:31.901491304
+0200
+++ linux-2.4.27-rc2-pa4mm/drivers/video/fbcon.c 2004-06-29 11:13:31.846343640
+0200
@@ -1877,7 +1877,10 @@

        font length must be multiple of 256, at least. And 256 is multiple
        of 4 */
     k = 0;

- while (p > new_data) k += *--(u32 *)p;
+ while (p > new_data) {
+ p = (u8 *)((u32 *)p - 1);
+ k += *(u32 *)p;
+ }

     FNTSUM(new_data) = k;
     /* Check if the same font is on some other console already */
     for (i = 0; i < MAX_NR_CONSOLES; i++) {

=========><=========
--- linux-2.4.27-rc2-pa4mm/lib/crc32.c.Orig 2004-06-29 11:29:31.721420448
+0200
+++ linux-2.4.27-rc2-pa4mm/lib/crc32.c 2004-06-29 11:36:19.964358088 +0200
@@ -99,7 +99,9 @@
/* Align it */ if(unlikely(((long)b)&3 && len)){
do {
- DO_CRC(*((u8 *)b)++);
+ u8 *p = (u8 *)b;
+ DO_CRC(*p++);
+ b = (void *)p;
} while ((--len) && ((long)b)&3 );
}
if(likely(len >= 4)){
@@ -120,7 +122,9 @@
/* And the last few bytes */ if(len){
do {
- DO_CRC(*((u8 *)b)++);
+ u8 *p = (u8 *)b;
+ DO_CRC(*p++);
+ b = (void *)p;
} while (--len);
}

@@ -200,7 +204,9 @@
/* Align it */ if(unlikely(((long)b)&3 && len)){
do {
- DO_CRC(*((u8 *)b)++);
+ u8 *p = (u8 *)b;
+ DO_CRC(*p++);
+ b = (void *)p;
} while ((--len) && ((long)b)&3 );
}
if(likely(len >= 4)){
@@ -221,7 +227,9 @@
/* And the last few bytes */ if(len){
do {
- DO_CRC(*((u8 *)b)++);
+ u8 *p = (u8 *)b;
+ DO_CRC(*p++);
+ b = (void *)p;
} while (--len);
}
return __be32_to_cpu(crc);
=========><=========

hth,
Joel

PS: because of bad wrapping pb with mail interface I also join original files

---------------------------------------------------------------------------
NEW: Tiscali ADSL LIGHT, 28,95 EUR/mois, c'est le moment de faire le pas!
http://reg.tiscali.be/default.asp?lg=fr

kernel/sysctl.c renamed from kernel/sysctl.c.Orig +3 -3
@@ -890,7 +890,7 @@
 				if (!isspace(c))
 					break;
 				left--;
-				((char *) buffer)++;
+				buffer += sizeof(char);
 			}
 			if (!left)
 				break;
@@ -1043,7 +1043,7 @@
 				if (!isspace(c))
 					break;
 				left--;
-				((char *) buffer)++;
+				buffer += sizeof(char);
 			}
 			if (!left)
 				break;
@@ -1144,7 +1144,7 @@
 				if (!isspace(c))
 					break;
 				left--;
-				((char *) buffer)++;
+				buffer += sizeof(char);
 			}
 			if (!left)
 				break;
fs/readdir.c renamed from fs/readdir.c.Orig +2 -2
@@ -264,7 +264,7 @@
 	put_user(reclen, &dirent->d_reclen);
 	copy_to_user(dirent->d_name, name, namlen);
 	put_user(0, dirent->d_name + namlen);
-	((char *) dirent) += reclen;
+	dirent = (void *)dirent + reclen;
 	buf->current_dir = dirent;
 	buf->count -= reclen;
 	return 0;
@@ -347,7 +347,7 @@
 	copy_to_user(dirent, &d, NAME_OFFSET(&d));
 	copy_to_user(dirent->d_name, name, namlen);
 	put_user(0, dirent->d_name + namlen);
-	((char *) dirent) += reclen;
+	dirent = (void *)dirent + reclen;
 	buf->current_dir = dirent;
 	buf->count -= reclen;
 	return 0;
drivers/video/fbcon.c renamed from drivers/video/fbcon.c.Orig +4 -1
@@ -1877,7 +1877,10 @@
        font length must be multiple of 256, at least. And 256 is multiple
        of 4 */
     k = 0;
-    while (p > new_data) k += *--(u32 *)p;
+    while (p > new_data) {
+        p = (u8 *)((u32 *)p - 1);
+        k += *(u32 *)p;
+    }
     FNTSUM(new_data) = k;
     /* Check if the same font is on some other console already */
     for (i = 0; i < MAX_NR_CONSOLES; i++) {
lib/crc32.c renamed from lib/crc32.c.Orig +12 -4
@@ -99,7 +99,9 @@
 	/* Align it */
 	if(unlikely(((long)b)&3 && len)){
 		do {
-			DO_CRC(*((u8 *)b)++);
+			u8 *p = (u8 *)b;
+			DO_CRC(*p++);
+			b = (void *)p;
 		} while ((--len) && ((long)b)&3 );
 	}
 	if(likely(len >= 4)){
@@ -120,7 +122,9 @@
 	/* And the last few bytes */
 	if(len){
 		do {
-			DO_CRC(*((u8 *)b)++);
+			u8 *p = (u8 *)b;
+			DO_CRC(*p++);
+			b = (void *)p;
 		} while (--len);
 	}
 
@@ -200,7 +204,9 @@
 	/* Align it */
 	if(unlikely(((long)b)&3 && len)){
 		do {
-			DO_CRC(*((u8 *)b)++);
+			u8 *p = (u8 *)b;
+			DO_CRC(*p++);
+			b = (void *)p;
 		} while ((--len) && ((long)b)&3 );
 	}
 	if(likely(len >= 4)){
@@ -221,7 +227,9 @@
 	/* And the last few bytes */
 	if(len){
 		do {
-			DO_CRC(*((u8 *)b)++);
+			u8 *p = (u8 *)b;
+			DO_CRC(*p++);
+			b = (void *)p;
 		} while (--len);
 	}
 	return __be32_to_cpu(crc);