mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-28 22:18:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

os2: misc build fixes

Browse Source
This commit is contained in:
Ozkan Sezer
2020-10-25 10:10:02 +03:00
parent bfc80d83c2
commit a4040293dd
5 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/os2/geniconv/os2iconv.c
View File

@@ -41,6 +41,10 @@
#endif
#include "os2cp.h"
#if !defined(min)
#define min(a, b) (((a) < (b)) ? (a) : (b))
#endif
#define MAX_CP_NAME_LEN 64
typedef struct iuconv_obj {
@@ -127,7 +131,7 @@ extern iconv_t _System os2_iconv_open(const char* tocode, const char* fromcode)
uo_fromcode = NULL;
}
iuobj = malloc(sizeof(iuconv_obj));
iuobj = (iuconv_obj *) malloc(sizeof(iuconv_obj));
iuobj->uo_tocode = uo_tocode;
iuobj->uo_fromcode = uo_fromcode;
iuobj->buf_len = 0;

6
src/core/os2/geniconv/sys2utf8.c
View File

@@ -83,15 +83,15 @@ int StrUTF8(int fToUTF8, char *pcDst, int cbDst, char *pcSrc, int cbSrc)
char *StrUTF8New(int fToUTF8, char *pcStr, int cbStr)
{
int cbNewStr = (((cbStr > 4)? cbStr : 4) + 1) * 2;
char *pszNewStr = malloc(cbNewStr);
char *pszNewStr = (char *) malloc(cbNewStr);
if (pszNewStr == NULL)
return NULL;
cbNewStr = StrUTF8(fToUTF8, pszNewStr, cbNewStr, pcStr, cbStr);
if (cbNewStr != -1) {
pcStr = realloc(pszNewStr, cbNewStr + ((fToUTF8)? 1 : sizeof(short)));
if (pcStr != NULL)
pcStr = (char *) realloc(pszNewStr, cbNewStr + ((fToUTF8)? 1 : sizeof(short)));
if (pcStr)
return pcStr;
}

4
src/core/os2/geniconv/test.c
View File

@@ -51,10 +51,10 @@ int main(void)
inbuf = StrUTF8New(1, acBuf, strlen(acBuf));
/* UTF-8 -> system cp. by StrUTF8() */
if (StrUTF8(0, &acBuf, sizeof(acBuf), inbuf, strlen(inbuf)) == -1) {
if (StrUTF8(0, acBuf, sizeof(acBuf), inbuf, strlen(inbuf)) == -1) {
puts("StrUTF8() failed");
} else {
printf("system cp. -> UTF-8 -> system cp.: %s\n", &acBuf);
printf("system cp. -> UTF-8 -> system cp.: %s\n", acBuf);
}
free(inbuf);