commit e2ab84f4a1f0e69f25c37ca30a1d0d22c346891c
author Paul Bakker <p.j.bakker@polarssl.org> Sat Jun 29 18:24:32 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Sat Jun 29 18:35:41 2013 +0200
tree c4ef4d6a4c635d244580a5c19efee2b3d9906d72
parent 89fe7f4388cf1fea199b7de5cd7ce67196997383

Renamed error_strerror() to the less conflicting polarssl_strerror()

Ability to keep old function error_strerror() as well with
POLARSSL_ERROR_STRERROR_BC. Also works with
POLARSSL_ERROR_STRERROR_DUMMY.

scripts/data_files/error.fmt

diff --git a/scripts/data_files/error.fmt b/scripts/data_files/error.fmt
index 93d1e4e..9a3e7e6 100644
--- a/scripts/data_files/error.fmt
+++ b/scripts/data_files/error.fmt
@@ -37,7 +37,7 @@
 #define  snprintf  _snprintf
 #endif
 
-void error_strerror( int ret, char *buf, size_t buflen )
+void polarssl_strerror( int ret, char *buf, size_t buflen )
 {
     size_t len;
     int use_ret;
@@ -88,6 +88,13 @@
     snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", use_ret );
 }
 
+#if defined(POLARSSL_ERROR_STRERROR_BC)
+void error_strerror( int ret, char *buf, size_t buflen )
+{
+    return polarssl_strerror( ret, buf, buflen );
+}
+#endif /* POLARSSL_ERROR_STRERROR_BC */
+
 #else /* POLARSSL_ERROR_C */
 
 #if defined(POLARSSL_ERROR_STRERROR_DUMMY)
@@ -97,7 +104,7 @@
 /*
  * Provide an non-function in case POLARSSL_ERROR_C is not defined
  */
-void error_strerror( int ret, char *buf, size_t buflen )
+void polarssl_strerror( int ret, char *buf, size_t buflen )
 {
     ((void) ret);
 
@@ -105,5 +112,12 @@
         buf[0] = '\0';
 }
 
+#if defined(POLARSSL_ERROR_STRERROR_BC)
+void error_strerror( int ret, char *buf, size_t buflen )
+{
+    return polarssl_strerror( ret, buf, buflen );
+}
+#endif /* POLARSSL_ERROR_STRERROR_BC */
 #endif /* POLARSSL_ERROR_STRERROR_DUMMY */
+
 #endif /* POLARSSL_ERROR_C */