lua: fix potential busy loop in net.poll()

[vlc] / src / text / charset.c

diff --git a/src/text/charset.c b/src/text/charset.c
index 6d4d2a7b4030f64b3d1c249cde0c29144c99babc..0cb2322654e4360ab770af91c155fe60e5ffb32d 100644 (file)
--- a/src/text/charset.c
+++ b/src/text/charset.c
@@ -3,24 +3,24 @@
  *****************************************************************************
  * See also unicode.c for Unicode to locale conversion helpers.
  *
- * Copyright (C) 2003-2008 the VideoLAN team
+ * Copyright (C) 2003-2008 VLC authors and VideoLAN
  *
  * Authors: Christophe Massiot
  *          Rémi Denis-Courmont
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * 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 General Public License for more details.
+ * 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 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.
+ * 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
@@ -29,14 +29,13 @@
 
 #include <vlc_common.h>
 
-#if !defined WIN32
+#if !defined _WIN32
 # include <locale.h>
 #else
 # include <windows.h>
 #endif
 
 #ifdef __APPLE__
-#   include <errno.h>
 #   include <string.h>
 #   include <xlocale.h>
 #endif
@@ -44,44 +43,34 @@
 #include "libvlc.h"
 #include <vlc_charset.h>
 
-char *vlc_fix_readdir( const char *psz_string )
+/**
+ * us_strtod() has the same prototype as ANSI C strtod() but it uses the
+ * POSIX/C decimal format, regardless of the current numeric locale.
+ */
+double us_strtod( const char *str, char **end )
 {
-#ifdef __APPLE__
-    vlc_iconv_t hd = vlc_iconv_open( "UTF-8", "UTF-8-MAC" );
+    locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL);
+    locale_t oldloc = uselocale (loc);
+    double res = strtod (str, end);
 
-    if (hd != (vlc_iconv_t)(-1))
+    if (loc != (locale_t)0)
     {
-        const char *psz_in = psz_string;
-        size_t i_in = strlen(psz_in);
-        size_t i_out = i_in * 2;
-        char *psz_utf8 = malloc(i_out + 1);
-        char *psz_out = psz_utf8;
-
-        size_t i_ret = vlc_iconv (hd, &psz_in, &i_in, &psz_out, &i_out);
-        vlc_iconv_close (hd);
-        if( i_ret == (size_t)(-1) || i_in )
-        {
-            free( psz_utf8 );
-            return strdup( psz_string );
-        }
-
-        *psz_out = '\0';
-        return psz_utf8;
+        uselocale (oldloc);
+        freelocale (loc);
     }
-#endif
-    return strdup( psz_string );
+    return res;
 }
 
 
 /**
- * us_strtod() has the same prototype as ANSI C strtod() but it uses the
+ * us_strtof() has the same prototype as ANSI C strtof() but it uses the
  * POSIX/C decimal format, regardless of the current numeric locale.
  */
-double us_strtod( const char *str, char **end )
+float us_strtof( const char *str, char **end )
 {
     locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL);
     locale_t oldloc = uselocale (loc);
-    double res = strtod (str, end);
+    float res = strtof (str, end);
 
     if (loc != (locale_t)0)
     {
@@ -91,6 +80,7 @@ double us_strtod( const char *str, char **end )
     return res;
 }
 
+
 /**
  * us_atof() has the same prototype as ANSI C atof() but it expects a dot
  * as decimal separator, regardless of the system locale.
@@ -102,19 +92,15 @@ double us_atof( const char *str )
 
 
 /**
- * us_asprintf() has the same prototype as asprintf(), but doesn't use
+ * us_vasprintf() has the same prototype as vasprintf(), but doesn't use
  * the system locale.
  */
-int us_asprintf( char **ret, const char *format, ... )
+int us_vasprintf( char **ret, const char *format, va_list ap )
 {
-    va_list ap;
     locale_t loc = newlocale( LC_NUMERIC_MASK, "C", NULL );
     locale_t oldloc = uselocale( loc );
-    int i_rc;
 
-    va_start( ap, format );
-    i_rc = vasprintf( ret, format, ap );
-    va_end( ap );
+    int i_rc = vasprintf( ret, format, ap );
 
     if ( loc != (locale_t)0 )
     {
@@ -124,3 +110,20 @@ int us_asprintf( char **ret, const char *format, ... )
 
     return i_rc;
 }
+
+
+/**
+ * us_asprintf() has the same prototype as asprintf(), but doesn't use
+ * the system locale.
+ */
+int us_asprintf( char **ret, const char *format, ... )
+{
+    va_list ap;
+    int i_rc;
+
+    va_start( ap, format );
+    i_rc = us_vasprintf( ret, format, ap );
+    va_end( ap );
+
+    return i_rc;
+}