version: 17.11-rc3

[dpdk.git] / lib / librte_eal / common / eal_common_errno.c

diff --git a/lib/librte_eal/common/eal_common_errno.c b/lib/librte_eal/common/eal_common_errno.c
index b238918..dc5b7c0 100644 (file)
--- a/lib/librte_eal/common/eal_common_errno.c
+++ b/lib/librte_eal/common/eal_common_errno.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -46,25 +46,31 @@ 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)
-               rte_snprintf(RTE_PER_LCORE(retval), RETVAL_SZ,
-                               "Unknown error %d", errnum);
+       if (errnum >= RTE_MAX_ERRNO)
+               snprintf(ret, RETVAL_SZ, "Unknown error%s %d", sep, errnum);
        else
                switch (errnum){
                case E_RTE_SECONDARY:
                        return "Invalid call in secondary process";
                case E_RTE_NO_CONFIG:
                        return "Missing rte_config structure";
-               case E_RTE_NO_TAILQ:
-                       return "No TAILQ initialised";
                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;
 }