Changeset 1a4ae5679d635d3393cdd9747ce42730c15d20f0

Timestamp:

06/08/05 21:09:54 (3 years ago)

Author:

Cyril Deguet <asmax@videolan.org>

git-committer:

Cyril Deguet <asmax@videolan.org> 1123355394 +0000

git-parent:

[9bcabfdad2c9d6a9a6da67e9395367da180c7b78]

git-author:

Cyril Deguet <asmax@videolan.org> 1123355394 +0000

Message:

• charset.c: don't return a pointer to a buffer allocated on the stack!
  
• all: removed some warnings
  

Files:

• modules/gui/skins2/controls/ctrl_list.cpp (modified) (1 diff)
• modules/gui/skins2/controls/ctrl_slider.cpp (modified) (1 diff)
• modules/gui/skins2/src/skin_common.hpp (modified) (1 diff)
• src/extras/getopt.c (modified) (1 diff)
• src/libvlc.c (modified) (1 diff)
• src/misc/charset.c (modified) (6 diffs)

modules/gui/skins2/controls/ctrl_list.cpp

@@ -40 +40 @@
-#endif
-
-
+f
-#define LINE_INTERVAL 1  // Number of pixels inserted between 2 lines
-

modules/gui/skins2/controls/ctrl_slider.cpp

@@ -36 +36 @@
-
-#define RANGE 40
-
+f
-
-

modules/gui/skins2/src/skin_common.hpp

@@ -45 +45 @@
-#ifndef M_PI
-#   define M_PI 3.14159265358979323846
+#endif
+
+#ifdef _MSC_VER
+// turn off 'warning C4355: 'this' : used in base member initializer list'
+#pragma warning ( disable:4355 )
-#endif
-

src/extras/getopt.c

@@ -216 +216 @@
-/* Avoid depending on library functions or files
-   whose names are inconsistent.  */
-
-char *getenv();
-
-static char *

src/libvlc.c

@@ -259 +259 @@
-    playlist_t  *p_playlist;
-    vlc_value_t  val;
+#if defined( ENABLE_NLS ) \
+     && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
-    char *       psz_language;
+#endif
-
-    if( !p_vlc )

src/misc/charset.c

@@ -204 +204 @@
-/* Returns charset from "language_COUNTRY.charset@modifier" string */
-#if defined WIN32 || defined OS2 || !HAVE_LANGINFO_CODESET
-const char *vlc_encoding_from_locale( char *psz_locale
+void vlc_encoding_from_locale( char *psz_locale, char *psz_charset
-{
-    char *psz_dot = strchr( psz_locale, '.' );
@@ -211 +211 @@
-    {
-        const char *psz_modifier;
-        char buf[2 + 10 + 1];
-
-        psz_dot++;
@@ -219 +218 @@
-
-        if( psz_modifier == NULL )
-
+
+
+
+
-        if( 0 < ( psz_modifier - psz_dot )
-sizeof( buf )
-
-buf
-buf
- buf
+2 + 10 + 1 
+
+psz_charset
+psz_charset
+
-        }
-    }
-    /* try language mapping */
-return vlc_encoding_from_language( psz_locale
+strcpy( psz_charset, vlc_encoding_from_language( psz_locale )
-}
-#endif
@@ -245 +247 @@
-    /* On old systems which lack it, use setlocale or getenv.  */
-    const char *psz_locale = NULL;
+    char buf[2 + 10 + 1];
-
-    /* But most old systems don't have a complete set of locales.  Some
@@ -266 +269 @@
-    /* On some old systems, one used to set locale = "iso8859_1". On others,
-     * you set it to "language_COUNTRY.charset". Darwin only has LANG :( */
-
+
+
-# endif /* HAVE_LANGINFO_CODESET */
-
@@ -299 +303 @@
-    }
-    if( psz_locale != NULL && psz_locale[0] != '\0' )
-
+
+
-    else
-    {