| Message ID | E1PFWEA-0005c0-2x@mnementh.archaic.org.uk |
|---|---|
| State | New |
| Headers | show |
On Mon, Nov 08, 2010 at 06:13:58PM +0000, Peter Maydell wrote: > Remove an unnecessary local variable from the __get_user() and > __put_user() macros. This avoids confusing compilation failures > if the name of the local variable ('size') happens to be the > same as the variable the macro user is trying to read/write. Looks fine, will push on my next patchset Acked-by: Riku Voipio <riku.voipio@iki.fi> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > linux-user/qemu.h | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/linux-user/qemu.h b/linux-user/qemu.h > index 708021e..d717392 100644 > --- a/linux-user/qemu.h > +++ b/linux-user/qemu.h > @@ -266,8 +266,7 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size) > */ > #define __put_user(x, hptr)\ > ({\ > - int size = sizeof(*hptr);\ > - switch(size) {\ > + switch(sizeof(*hptr)) {\ > case 1:\ > *(uint8_t *)(hptr) = (uint8_t)(typeof(*hptr))(x);\ > break;\ > @@ -288,8 +287,7 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size) > > #define __get_user(x, hptr) \ > ({\ > - int size = sizeof(*hptr);\ > - switch(size) {\ > + switch(sizeof(*hptr)) {\ > case 1:\ > x = (typeof(*hptr))*(uint8_t *)(hptr);\ > break;\ > -- > 1.7.1 >
diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 708021e..d717392 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -266,8 +266,7 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size) */ #define __put_user(x, hptr)\ ({\ - int size = sizeof(*hptr);\ - switch(size) {\ + switch(sizeof(*hptr)) {\ case 1:\ *(uint8_t *)(hptr) = (uint8_t)(typeof(*hptr))(x);\ break;\ @@ -288,8 +287,7 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size) #define __get_user(x, hptr) \ ({\ - int size = sizeof(*hptr);\ - switch(size) {\ + switch(sizeof(*hptr)) {\ case 1:\ x = (typeof(*hptr))*(uint8_t *)(hptr);\ break;\
Remove an unnecessary local variable from the __get_user() and __put_user() macros. This avoids confusing compilation failures if the name of the local variable ('size') happens to be the same as the variable the macro user is trying to read/write. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- linux-user/qemu.h | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)