[vlc-devel] [PATCH] Android: implement vlc_strerror and vlc_strerror_c

Edward Wang edward.c.wang at compdigitec.com
Wed Jan 8 04:10:20 CET 2014


Android does not have strerror_l() and won't have it any time soon.

Localization is not required as these messages will never be displayed.
---
 src/Makefile.am     |  1 +
 src/android/error.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 src/android/error.c

diff --git a/src/Makefile.am b/src/Makefile.am
index aeff20a..474da25 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -259,6 +259,7 @@ SOURCES_libvlc_darwin = \
 SOURCES_libvlc_android = \
 	android/dirs.c \
 	android/thread.c \
+	android/error.c \
 	posix/filesystem.c \
 	android/netconf.c \
 	posix/plugin.c \
diff --git a/src/android/error.c b/src/android/error.c
new file mode 100644
index 0000000..f652bc7
--- /dev/null
+++ b/src/android/error.c
@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * error.c: Android error messages formatting
+ *****************************************************************************
+ * Copyright © 2014 Edward Wang
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <string.h>
+
+#include <vlc_common.h>
+
+static __thread char android_buf[100];
+
+static const char* vlc_strerror_l(int errnum, const char *lname)
+{
+    VLC_UNUSED(lname);
+    return vlc_strerror(errnum);
+}
+
+const char* vlc_strerror(int errnum)
+{
+    strerror_r(errnum, android_buf, 100);
+    return android_buf;
+}
+
+const char* vlc_strerror_c(int errnum)
+{
+    return vlc_strerror(errnum);
+}
-- 
1.8.5.2




More information about the vlc-devel mailing list