From df71d4eeae7fe300ad2a7c5a95c4531cfd2472b5 Mon Sep 17 00:00:00 2001 From: uyjulian Date: Sat, 22 Feb 2020 11:03:05 -0600 Subject: [PATCH] Remove unnecessary inline specifier from functions --- ee_core/include/util.h | 8 ++++---- ee_core/src/util.c | 8 ++++---- include/ioprp.h | 2 +- include/util.h | 6 +++--- modules/network/smap-ingame/main.c | 2 +- modules/network/smap-ingame/main.h | 2 +- src/ioprp.c | 2 +- src/util.c | 10 +++++----- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ee_core/include/util.h b/ee_core/include/util.h index 87c67c23c..19157312f 100644 --- a/ee_core/include/util.h +++ b/ee_core/include/util.h @@ -12,16 +12,16 @@ #include -inline void _strcpy(char *dst, const char *src); -inline void _strcat(char *dst, const char *src); +void _strcpy(char *dst, const char *src); +void _strcat(char *dst, const char *src); int _strncmp(const char *s1, const char *s2, int length); int _strcmp(const char *s1, const char *s2); char *_strchr(const char *string, int c); char *_strrchr(const char *string, int c); char *_strtok(char *strToken, const char *strDelimit); char *_strstr(const char *string, const char *substring); -inline int _islower(int c); -inline int _toupper(int c); +int _islower(int c); +int _toupper(int c); int _memcmp(const void *s1, const void *s2, unsigned int length); unsigned int _strtoui(const char *p); int _strtoi(const char *p); diff --git a/ee_core/src/util.c b/ee_core/src/util.c index 90a05a9f5..013265ba3 100644 --- a/ee_core/src/util.c +++ b/ee_core/src/util.c @@ -20,13 +20,13 @@ extern int size_cdvdfsv_irx; extern void *_end; /* Do not link to strcpy() from libc */ -inline void _strcpy(char *dst, const char *src) +void _strcpy(char *dst, const char *src) { strncpy(dst, src, strlen(src) + 1); } /* Do not link to strcat() from libc */ -inline void _strcat(char *dst, const char *src) +void _strcat(char *dst, const char *src) { _strcpy(&dst[strlen(dst)], src); } @@ -177,7 +177,7 @@ char *_strstr(const char *string, const char *substring) } /* Do not link to islower() from libc */ -inline int _islower(int c) +int _islower(int c) { if ((c < 'a') || (c > 'z')) return 0; @@ -188,7 +188,7 @@ inline int _islower(int c) } /* Do not link to toupper() from libc */ -inline int _toupper(int c) +int _toupper(int c) { if (_islower(c)) c -= 32; diff --git a/include/ioprp.h b/include/ioprp.h index 10b175ad1..30208185d 100644 --- a/include/ioprp.h +++ b/include/ioprp.h @@ -1 +1 @@ -inline unsigned int patch_IOPRP_image(void *ioprp_image, void *cdvdman_module, unsigned int size_cdvdman); +unsigned int patch_IOPRP_image(void *ioprp_image, void *cdvdman_module, unsigned int size_cdvdman); diff --git a/include/util.h b/include/util.h index a4820d5ac..c6b7033c4 100644 --- a/include/util.h +++ b/include/util.h @@ -28,8 +28,8 @@ int readFileBuffer(file_buffer_t *readContext, char **outBuf); void writeFileBuffer(file_buffer_t *fileBuffer, char *inBuf, int size); void closeFileBuffer(file_buffer_t *fileBuffer); -inline int max(int a, int b); -inline int min(int a, int b); +int max(int a, int b); +int min(int a, int b); int fromHex(char digit); char toHex(int digit); @@ -50,6 +50,6 @@ int sysDeleteFolder(const char *folder); int CheckPS2Logo(int fd, u32 lba); -inline void delay(int count); +void delay(int count); #endif diff --git a/modules/network/smap-ingame/main.c b/modules/network/smap-ingame/main.c index 94503c23d..93163a400 100644 --- a/modules/network/smap-ingame/main.c +++ b/modules/network/smap-ingame/main.c @@ -136,7 +136,7 @@ static err_t SMapIFInit(NetIF *pNetIF) return ERR_OK; } -inline void SMapLowLevelInput(PBuf *pBuf) +void SMapLowLevelInput(PBuf *pBuf) { //When we receive data, the interrupt-handler will invoke this function, which means we are in an interrupt-context. Pass on //the received data to ps2ip. diff --git a/modules/network/smap-ingame/main.h b/modules/network/smap-ingame/main.h index 873fe43ab..baef4fa49 100644 --- a/modules/network/smap-ingame/main.h +++ b/modules/network/smap-ingame/main.h @@ -30,6 +30,6 @@ int SMAPStart(void); void SMAPStop(void); int SMAPGetMACAddress(unsigned char *buffer); -inline void SMapLowLevelInput(struct pbuf *pBuf); +void SMapLowLevelInput(struct pbuf *pBuf); #include "xfer.h" diff --git a/src/ioprp.c b/src/ioprp.c index 880fd6466..b84929cba 100644 --- a/src/ioprp.c +++ b/src/ioprp.c @@ -29,7 +29,7 @@ static inline void Align_offsets(void *base_address, unsigned int *offset_in, st /*---------------------------------------------------------------------------------------- Replace modules in a IOPRP image. ------------------------------------------------------------------------------------------*/ -inline unsigned int patch_IOPRP_image(void *ioprp_image, void *cdvdman_module, unsigned int size_cdvdman) +unsigned int patch_IOPRP_image(void *ioprp_image, void *cdvdman_module, unsigned int size_cdvdman) { unsigned int offset_in, offset_out; /* For processing purposes */ struct romdir_entry *romdir_in, *romdir_out; diff --git a/src/util.c b/src/util.c index 8261e5f7f..06ea3cea9 100644 --- a/src/util.c +++ b/src/util.c @@ -380,14 +380,14 @@ void closeFileBuffer(file_buffer_t *fileBuffer) fileBuffer = NULL; } -// a simple maximum of two inline -inline int max(int a, int b) +// a simple maximum of two +int max(int a, int b) { return a > b ? a : b; } -// a simple minimum of two inline -inline int min(int a, int b) +// a simple minimum of two +int min(int a, int b) { return a < b ? a : b; } @@ -606,7 +606,7 @@ int sysDeleteFolder(const char *folder) /*----------------------------------------------------------------------------------------*/ /* NOP delay. */ /*----------------------------------------------------------------------------------------*/ -inline void delay(int count) +void delay(int count) { int i, ret;