diff mbox

[dpdk-dev] eal: cleanup strerror function

Message ID 20170907130956.157969-1-bruce.richardson@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Bruce Richardson Sept. 7, 2017, 1:09 p.m. UTC 
  When compiled on Ubuntu with extra warnings enabled, the rte_strerror()
function triggered a warning about an unused return value from
strerror_r(). Rather than always have this warning disabled, we fix this,
and in the process do some cleanup of the code so as to reduce the
complexity of the fix, e.g. not having the #ifdef macros inside the
snprintf call.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_eal/common/eal_common_errno.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

Comments

Stephen Hemminger Sept. 7, 2017, 5:51 p.m. UTC | #1 
On Thu,  7 Sep 2017 14:09:56 +0100
Bruce Richardson <bruce.richardson@intel.com> wrote:

> +	/* BSD puts a colon in the "unknown error" messages, Linux doesn't */
> +#ifdef RTE_EXEC_ENV_BSDAPP
> +	static const char *sep = ":";
> +#else
> +	static const char *sep = "";
> +#endif

This is seems unnecessary to me just have the message be different.
Bruce Richardson Sept. 8, 2017, 9:03 a.m. UTC | #2 
On Thu, Sep 07, 2017 at 10:51:52AM -0700, Stephen Hemminger wrote:
> On Thu,  7 Sep 2017 14:09:56 +0100
> Bruce Richardson <bruce.richardson@intel.com> wrote:
> 
> > +	/* BSD puts a colon in the "unknown error" messages, Linux doesn't */
> > +#ifdef RTE_EXEC_ENV_BSDAPP
> > +	static const char *sep = ":";
> > +#else
> > +	static const char *sep = "";
> > +#endif
> 
> This is seems unnecessary to me just have the message be different.

I'd rather keep it consistent for the sake of the couple of lines of
code. What would be better is if there was a C variable we could use for
this to avoid macros, but I not aware of one right now that could work.
Again, open to suggestions on that. Even with keeping the macros, this
is still cleaner than the previous version.

/Bruce
Van Haaren, Harry Sept. 15, 2017, 10:47 a.m. UTC | #3 
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Bruce Richardson
> Sent: Thursday, September 7, 2017 2:10 PM
> To: dev@dpdk.org
> Cc: Richardson, Bruce <bruce.richardson@intel.com>
> Subject: [dpdk-dev] [PATCH] eal: cleanup strerror function
> 
> When compiled on Ubuntu with extra warnings enabled, the rte_strerror()
> function triggered a warning about an unused return value from
> strerror_r(). Rather than always have this warning disabled, we fix this,
> and in the process do some cleanup of the code so as to reduce the
> complexity of the fix, e.g. not having the #ifdef macros inside the
> snprintf call.
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>

Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
Thomas Monjalon Oct. 5, 2017, 9:55 p.m. UTC | #4 
> > When compiled on Ubuntu with extra warnings enabled, the rte_strerror()
> > function triggered a warning about an unused return value from
> > strerror_r(). Rather than always have this warning disabled, we fix this,
> > and in the process do some cleanup of the code so as to reduce the
> > complexity of the fix, e.g. not having the #ifdef macros inside the
> > snprintf call.
> > 
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> 
> Acked-by: Harry van Haaren <harry.van.haaren@intel.com>

Applied, thanks
diff mbox

Patch

diff --git a/lib/librte_eal/common/eal_common_errno.c b/lib/librte_eal/common/eal_common_errno.c
index de48d8e..dc5b7c0 100644
--- a/lib/librte_eal/common/eal_common_errno.c
+++ b/lib/librte_eal/common/eal_common_errno.c
@@ -46,18 +46,20 @@  RTE_DEFINE_PER_LCORE(int, _rte_errno);
 const char *
 rte_strerror(int errnum)
 {
+	/* BSD puts a colon in the "unknown error" messages, Linux doesn't */
+#ifdef RTE_EXEC_ENV_BSDAPP
+	static const char *sep = ":";
+#else
+	static const char *sep = "";
+#endif
 #define RETVAL_SZ 256
 	static RTE_DEFINE_PER_LCORE(char[RETVAL_SZ], retval);
+	char *ret = RTE_PER_LCORE(retval);
 
 	/* since some implementations of strerror_r throw an error
 	 * themselves if errnum is too big, we handle that case here */
-	if (errnum > RTE_MAX_ERRNO)
-		snprintf(RTE_PER_LCORE(retval), RETVAL_SZ,
-#ifdef RTE_EXEC_ENV_BSDAPP
-				"Unknown error: %d", errnum);
-#else
-				"Unknown error %d", errnum);
-#endif
+	if (errnum >= RTE_MAX_ERRNO)
+		snprintf(ret, RETVAL_SZ, "Unknown error%s %d", sep, errnum);
 	else
 		switch (errnum){
 		case E_RTE_SECONDARY:
@@ -65,8 +67,10 @@  rte_strerror(int errnum)
 		case E_RTE_NO_CONFIG:
 			return "Missing rte_config structure";
 		default:
-			strerror_r(errnum, RTE_PER_LCORE(retval), RETVAL_SZ);
+			if (strerror_r(errnum, ret, RETVAL_SZ) != 0)
+				snprintf(ret, RETVAL_SZ, "Unknown error%s %d",
+						sep, errnum);
 		}
 
-	return RTE_PER_LCORE(retval);
+	return ret;
 }