[Lame-cvs] SF.net SVN: lame:[6530] trunk/lame/frontend

[<ale...@us...>]

Revision: 6530
          http://sourceforge.net/p/lame/svn/6530
Author:   aleidinger
Date:     2023-12-18 13:40:31 +0000 (Mon, 18 Dec 2023)
Log Message:
-----------
Use better return types and provide prototype for toUtf8().

Modified Paths:
--------------
    trunk/lame/frontend/main.h
    trunk/lame/frontend/parse.c

Modified: trunk/lame/frontend/main.h
===================================================================
--- trunk/lame/frontend/main.h	2023-12-15 12:07:55 UTC (rev 6529)
+++ trunk/lame/frontend/main.h	2023-12-18 13:40:31 UTC (rev 6530)
@@ -93,6 +93,7 @@
 extern char* utf8ToLocal8Bit(const char* str);
 extern unsigned short* utf8ToUtf16(char const* mbstr);
 extern char* utf8ToLatin1(char const* str);
+extern char* local8BitToUtf8(const char* str);
 #ifdef _WIN32
 extern wchar_t* utf8ToUnicode(char const* mbstr);
 extern char *unicodeToUtf8(const wchar_t *wstr);

Modified: trunk/lame/frontend/parse.c
===================================================================
--- trunk/lame/frontend/parse.c	2023-12-15 12:07:55 UTC (rev 6529)
+++ trunk/lame/frontend/parse.c	2023-12-18 13:40:31 UTC (rev 6530)
@@ -367,7 +367,7 @@
     return utf8ToUtf16(s);
 }
 
-unsigned short* toUtf8(char const* s)
+char* toUtf8(char const* s)
 {
     return local8BitToUtf8(s);
 }
@@ -436,7 +436,6 @@
         default:
             return -3;
     }
-    return 0;
 }
 #endif