[dpdk-dev] net: rename u16 to fix shadowed declaration warning
Checks
Commit Message
This patch renames u16 to u16_buf. u16 as a variable name causes a shadowed
declaration warning if, for example, the application also typedefs u16
(e.g. by including a header containing "typedef unsigned short u16") and
the application is built with -Wshadow.
Signed-off-by: Gage Eads <gage.eads@intel.com>
---
lib/librte_net/rte_ip.h | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
Comments
On Mon, Jun 04, 2018 at 02:40:00PM -0500, Gage Eads wrote:
> This patch renames u16 to u16_buf. u16 as a variable name causes a shadowed
> declaration warning if, for example, the application also typedefs u16
> (e.g. by including a header containing "typedef unsigned short u16") and
> the application is built with -Wshadow.
>
> Signed-off-by: Gage Eads <gage.eads@intel.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
25/06/2018 17:38, Olivier Matz:
> On Mon, Jun 04, 2018 at 02:40:00PM -0500, Gage Eads wrote:
> > This patch renames u16 to u16_buf. u16 as a variable name causes a shadowed
> > declaration warning if, for example, the application also typedefs u16
> > (e.g. by including a header containing "typedef unsigned short u16") and
> > the application is built with -Wshadow.
> >
> > Signed-off-by: Gage Eads <gage.eads@intel.com>
>
> Acked-by: Olivier Matz <olivier.matz@6wind.com>
Applied, thanks
@@ -108,25 +108,25 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum)
/* workaround gcc strict-aliasing warning */
uintptr_t ptr = (uintptr_t)buf;
typedef uint16_t __attribute__((__may_alias__)) u16_p;
- const u16_p *u16 = (const u16_p *)ptr;
-
- while (len >= (sizeof(*u16) * 4)) {
- sum += u16[0];
- sum += u16[1];
- sum += u16[2];
- sum += u16[3];
- len -= sizeof(*u16) * 4;
- u16 += 4;
+ const u16_p *u16_buf = (const u16_p *)ptr;
+
+ while (len >= (sizeof(*u16_buf) * 4)) {
+ sum += u16_buf[0];
+ sum += u16_buf[1];
+ sum += u16_buf[2];
+ sum += u16_buf[3];
+ len -= sizeof(*u16_buf) * 4;
+ u16_buf += 4;
}
- while (len >= sizeof(*u16)) {
- sum += *u16;
- len -= sizeof(*u16);
- u16 += 1;
+ while (len >= sizeof(*u16_buf)) {
+ sum += *u16_buf;
+ len -= sizeof(*u16_buf);
+ u16_buf += 1;
}
/* if length is in odd bytes */
if (len == 1)
- sum += *((const uint8_t *)u16);
+ sum += *((const uint8_t *)u16_buf);
return sum;
}