-Wshadow: fixes for checksum.h
RFC PATCH 7/9 -Wshadow: fixes for checksum.h
(please see the mail titled
"[RFC][PATCH 0/9] -Wshadow: Making the kernel build clean with -Wshadow" for an explanation of why I'm doing this)
Some -Wshadow fixes for include/[asm-i386|net]/checksum.h
include/asm/checksum.h:185: warning: declaration of 'sum' shadows a parameter include/asm/checksum.h:181: warning: shadowed declaration is here include/net/checksum.h:33: warning: declaration of 'sum' shadows a parameter include/net/checksum.h:31: warning: shadowed declaration is here
Signed-off-by Jesper Juhl <[email protected]>
---
include/asm-i386/checksum.h | 4 ++-- include/net/checksum.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
include/asm-i386/checksum.h +2 -2
@@ -178,12 +178,12 @@ static __inline__ unsigned short int csu#define HAVE_CSUM_COPY_USER static __inline__unsigned int csum_and_copy_to_user (const unsigned char *src,unsigned char __user *dst, -int len,int sum, +int len,int csum,int *err_ptr) {might_sleep ();if (access_ok (VERIFY_WRITE , dst, len)) -return csum_partial_copy_generic (src, (__force unsigned char *)dst, len, sum,NULL , err_ptr); +return csum_partial_copy_generic (src, (__force unsigned char *)dst, len, csum,NULL , err_ptr);if (len) *err_ptr = -EFAULT ;
include/net/checksum.h +6 -6
@@ -28,27 +28,27 @@#ifndef _HAVE_ARCH_COPY_AND_CSUM_FROM_USERstatic inline unsigned int csum_and_copy_from_user (const unsigned char __user *src,unsigned char *dst, -int len,int sum,int *err_ptr) +int len,int csum,int *err_ptr) {if (access_ok (VERIFY_READ , src, len)) -return csum_partial_copy_from_user (src, dst, len, sum, err_ptr); +return csum_partial_copy_from_user (src, dst, len, csum, err_ptr);if (len) *err_ptr = -EFAULT ; -return sum; +return csum; }#endif #ifndef HAVE_CSUM_COPY_USER static __inline__unsigned int csum_and_copy_to_user -(const unsigned char *src,unsigned char __user *dst,int len,unsigned int sum,int *err_ptr) +(const unsigned char *src,unsigned char __user *dst,int len,unsigned int csum,int *err_ptr) { - sum =csum_partial (src, len, sum); + sum =csum_partial (src, len, csum);if (access_ok (VERIFY_WRITE , dst, len)) {if (copy_to_user (dst, src, len) ==0 ) -return sum; +return csum; }if (len) *err_ptr = -EFAULT ;