Date: Sun, 22 Sep 2019 18:32:05 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r352605 - head/sys/contrib/octeon-sdk Message-ID: <201909221832.x8MIW5rq018167@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Sun Sep 22 18:32:05 2019 New Revision: 352605 URL: https://svnweb.freebsd.org/changeset/base/352605 Log: octeon-sdk: suppress another set of warnings under clang Clang sees this construct and warns that adding an int to a string like this does not concatenate the two. Fortunately, this is not what octeon-sdk actually intended to do, so we take the path towards remediation that clang offers: use array indexing instead. Modified: head/sys/contrib/octeon-sdk/cvmx-app-init.h Modified: head/sys/contrib/octeon-sdk/cvmx-app-init.h ============================================================================== --- head/sys/contrib/octeon-sdk/cvmx-app-init.h Sun Sep 22 18:30:19 2019 (r352604) +++ head/sys/contrib/octeon-sdk/cvmx-app-init.h Sun Sep 22 18:32:05 2019 (r352605) @@ -355,7 +355,7 @@ enum cvmx_chip_types_enum { #define CVMX_BOARD_TYPE_NAO38 CVMX_BOARD_TYPE_NAC38 /* Functions to return string based on type */ -#define ENUM_BRD_TYPE_CASE(x) case x: return(#x + 16); /* Skip CVMX_BOARD_TYPE_ */ +#define ENUM_BRD_TYPE_CASE(x) case x: return(&#x[16]); /* Skip CVMX_BOARD_TYPE_ */ static inline const char *cvmx_board_type_to_string(enum cvmx_board_types_enum type) { switch (type) @@ -491,7 +491,7 @@ static inline const char *cvmx_board_type_to_string(en return "Unsupported Board"; } -#define ENUM_CHIP_TYPE_CASE(x) case x: return(#x + 15); /* Skip CVMX_CHIP_TYPE */ +#define ENUM_CHIP_TYPE_CASE(x) case x: return(&#x[15]); /* Skip CVMX_CHIP_TYPE */ static inline const char *cvmx_chip_type_to_string(enum cvmx_chip_types_enum type) { switch (type)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909221832.x8MIW5rq018167>