From f58619bb9fbf65ddffdd36f9fb7c347227eff97b Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Mon, 26 Feb 2018 11:48:33 -0700 Subject: [PATCH] possible shadowed global variable declaration in NETOS --- wolfcrypt/src/misc.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/wolfcrypt/src/misc.c b/wolfcrypt/src/misc.c index 5012d4b76..484ffd501 100644 --- a/wolfcrypt/src/misc.c +++ b/wolfcrypt/src/misc.c @@ -255,44 +255,44 @@ STATIC INLINE void c32to24(word32 in, word24 out) } /* convert 16 bit integer to opaque */ -STATIC INLINE void c16toa(word16 u16, byte* c) +STATIC INLINE void c16toa(word16 wc_u16, byte* c) { - c[0] = (u16 >> 8) & 0xff; - c[1] = u16 & 0xff; + c[0] = (wc_u16 >> 8) & 0xff; + c[1] = wc_u16 & 0xff; } /* convert 32 bit integer to opaque */ -STATIC INLINE void c32toa(word32 u32, byte* c) +STATIC INLINE void c32toa(word32 wc_u32, byte* c) { - c[0] = (u32 >> 24) & 0xff; - c[1] = (u32 >> 16) & 0xff; - c[2] = (u32 >> 8) & 0xff; - c[3] = u32 & 0xff; + c[0] = (wc_u32 >> 24) & 0xff; + c[1] = (wc_u32 >> 16) & 0xff; + c[2] = (wc_u32 >> 8) & 0xff; + c[3] = wc_u32 & 0xff; } /* convert a 24 bit integer into a 32 bit one */ -STATIC INLINE void c24to32(const word24 u24, word32* u32) +STATIC INLINE void c24to32(const word24 wc_u24, word32* wc_u32) { - *u32 = (u24[0] << 16) | (u24[1] << 8) | u24[2]; + *wc_u32 = (wc_u24[0] << 16) | (wc_u24[1] << 8) | wc_u24[2]; } /* convert opaque to 24 bit integer */ -STATIC INLINE void ato24(const byte* c, word32* u24) +STATIC INLINE void ato24(const byte* c, word32* wc_u24) { - *u24 = (c[0] << 16) | (c[1] << 8) | c[2]; + *wc_u24 = (c[0] << 16) | (c[1] << 8) | c[2]; } /* convert opaque to 16 bit integer */ -STATIC INLINE void ato16(const byte* c, word16* u16) +STATIC INLINE void ato16(const byte* c, word16* wc_u16) { - *u16 = (word16) ((c[0] << 8) | (c[1])); + *wc_u16 = (word16) ((c[0] << 8) | (c[1])); } /* convert opaque to 32 bit integer */ -STATIC INLINE void ato32(const byte* c, word32* u32) +STATIC INLINE void ato32(const byte* c, word32* wc_u32) { - *u32 = (c[0] << 24) | (c[1] << 16) | (c[2] << 8) | c[3]; + *wc_u32 = (c[0] << 24) | (c[1] << 16) | (c[2] << 8) | c[3]; }