diff --git a/arm11/Makefile b/arm11/Makefile index 3618de3..716257a 100644 --- a/arm11/Makefile +++ b/arm11/Makefile @@ -35,7 +35,7 @@ #--------------------------------------------------------------------------------- ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -marm -mthumb-interwork -CFLAGS := $(ARCH) -std=c11 -O2 -g -flto -mword-relocations -ffunction-sections \ +CFLAGS := $(ARCH) -std=gnu11 -O2 -g -flto -mword-relocations -ffunction-sections \ -Wall -Wextra -Wno-unused-function CFLAGS += $(INCLUDE) $(DEFINES) diff --git a/include/arm11/menu/menu_util.h b/include/arm11/menu/menu_util.h index c254b2b..af7bbce 100644 --- a/include/arm11/menu/menu_util.h +++ b/include/arm11/menu/menu_util.h @@ -22,7 +22,6 @@ -char* mallocpyString(const char* str); void truncateString(char* dest, const char* orig, int nsize, int tpos); void formatBytes(char* str, u64 bytes); void keysToString(u32 keys, char* string); diff --git a/source/arm11/fmt.c b/source/arm11/fmt.c index dc88572..89886fb 100644 --- a/source/arm11/fmt.c +++ b/source/arm11/fmt.c @@ -75,15 +75,6 @@ #define IS_DIGIT(c) ((c) >= '0' && (c) <= '9') -u32 strnlen(const char *string, u32 maxlen) -{ - u32 size; - - for(size = 0; size < maxlen && *string; string++, size++); - - return size; -} - static s32 skipAtoi(const char **s) { s32 i = 0; diff --git a/source/arm11/menu/menu_fsel.c b/source/arm11/menu/menu_fsel.c index b41136a..47b7a09 100644 --- a/source/arm11/menu/menu_fsel.c +++ b/source/arm11/menu/menu_fsel.c @@ -160,7 +160,7 @@ dir_buffer[n_entries].fsize = 0; dir_buffer[n_entries].is_dir = 1; - dir_buffer[n_entries].fname = mallocpyString(root_paths[i]); + dir_buffer[n_entries].fname = strdup(root_paths[i]); n_entries++; } @@ -173,7 +173,7 @@ dir_buffer[n_entries].fsize = firm_size; dir_buffer[n_entries].is_dir = 0; - dir_buffer[n_entries].fname = mallocpyString(firm_paths[i]); + dir_buffer[n_entries].fname = strdup(firm_paths[i]); n_entries++; } } @@ -206,7 +206,7 @@ // take over data dir_buffer[n_entries].fsize = finfo[i].fsize; dir_buffer[n_entries].is_dir = finfo[i].fattrib & AM_DIR; - dir_buffer[n_entries].fname = mallocpyString(finfo[i].fname); + dir_buffer[n_entries].fname = strdup(finfo[i].fname); // check for out of memory if (!dir_buffer[n_entries].fname) diff --git a/source/arm11/menu/menu_util.c b/source/arm11/menu/menu_util.c index 0364071..d980801 100644 --- a/source/arm11/menu/menu_util.c +++ b/source/arm11/menu/menu_util.c @@ -33,15 +33,6 @@ #define BORDER_WIDTH 2 // in pixel -char* mallocpyString(const char* str) -{ - u32 strsize = strlen(str) + 1; - char* astr = (char*) malloc(strsize); - - if (astr) strncpy(astr, str, strsize); - return astr; -} - void truncateString(char* dest, const char* orig, int nsize, int tpos) { int osize = strlen(orig);