From 623b9904f8fa00def359d8eb24ed4c5de176a10f Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Thu, 28 Nov 2024 18:51:16 +0100 Subject: [PATCH] Revert "Merge pull request #681 from uyjulian/iomanx_file_struct_stk" This reverts commit 89d7ece5047dd62464164bb9bce862f10d5c50d7, reversing changes made to a7d522936a382871da87d6e637ae50458528015f. --- iop/system/iomanx/Makefile | 2 +- iop/system/iomanx/src/iomanX.c | 63 ---------------------------------- 2 files changed, 1 insertion(+), 64 deletions(-) diff --git a/iop/system/iomanx/Makefile b/iop/system/iomanx/Makefile index 50232801eb4..a58719d7dd2 100644 --- a/iop/system/iomanx/Makefile +++ b/iop/system/iomanx/Makefile @@ -8,7 +8,7 @@ IOP_BIN ?= iomanX.irx -IOP_CFLAGS += -DIOMANX_OLD_NAME_ADDDELDRV=0 -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_ENABLE_LEGACY_IOMAN_HOOK -DIOMAN_USE_FILE_STRUCT_TEMP_STACK +IOP_CFLAGS += -DIOMANX_OLD_NAME_ADDDELDRV=0 -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_ENABLE_LEGACY_IOMAN_HOOK IOP_OBJS = iomanX.o ioman_sbv.o exports.o imports.o diff --git a/iop/system/iomanx/src/iomanX.c b/iop/system/iomanx/src/iomanX.c index 828e5b411d3..ea13e71071b 100644 --- a/iop/system/iomanx/src/iomanX.c +++ b/iop/system/iomanx/src/iomanX.c @@ -608,17 +608,10 @@ int iomanX_remove(const char *name) { iomanX_iop_file_t *f; const char *parsefile_res; -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - iomanX_iop_file_t f_stk; -#endif -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - f = &f_stk; -#else f = new_iob(); if ( !f ) return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); -#endif parsefile_res = parsefile(name, &(f->device), &(f->unit)); if ( !parsefile_res ) return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); @@ -640,17 +633,10 @@ static int xx_stat(int op, const char *name, iox_stat_t *stat, unsigned int stat { iomanX_iop_file_t *f; const char *parsefile_res; -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - iomanX_iop_file_t f_stk; -#endif -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - f = &f_stk; -#else f = new_iob(); if ( !f ) return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); -#endif parsefile_res = parsefile(name, &(f->device), &(f->unit)); if ( !parsefile_res ) return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); @@ -716,17 +702,10 @@ int iomanX_format(const char *dev, const char *blockdev, void *arg, int arglen) { iomanX_iop_file_t *f; const char *parsefile_res; -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - iomanX_iop_file_t f_stk; -#endif -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - f = &f_stk; -#else f = new_iob(); if ( !f ) return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); -#endif parsefile_res = parsefile(dev, &(f->device), &(f->unit)); if ( !parsefile_res ) return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); @@ -743,17 +722,10 @@ static int xx_rename(int op, const char *oldname, const char *newname) const char *parsefile_res_new; iomanX_iop_device_t *device_new; int unit_new; -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - iomanX_iop_file_t f_stk; -#endif -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - f = &f_stk; -#else f = new_iob(); if ( !f ) return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); -#endif parsefile_res = parsefile(oldname, &(f->device), &(f->unit)); if ( !parsefile_res ) return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); @@ -811,17 +783,10 @@ static int xx_dir(int op, const char *name, int mode) { iomanX_iop_file_t *f; const char *parsefile_res; -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - iomanX_iop_file_t f_stk; -#endif -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - f = &f_stk; -#else f = new_iob(); if ( !f ) return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); -#endif parsefile_res = parsefile(name, &(f->device), &(f->unit)); if ( !parsefile_res ) return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); @@ -857,17 +822,10 @@ int iomanX_mount(const char *fsname, const char *devname, int flag, void *arg, i { iomanX_iop_file_t *f; const char *parsefile_res; -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - iomanX_iop_file_t f_stk; -#endif -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - f = &f_stk; -#else f = new_iob(); if ( !f ) return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); -#endif parsefile_res = parsefile(fsname, &(f->device), &(f->unit)); if ( !parsefile_res ) return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); @@ -884,17 +842,10 @@ int iomanX_umount(const char *fsname) { iomanX_iop_file_t *f; const char *parsefile_res; -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - iomanX_iop_file_t f_stk; -#endif -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - f = &f_stk; -#else f = new_iob(); if ( !f ) return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); -#endif parsefile_res = parsefile(fsname, &(f->device), &(f->unit)); if ( !parsefile_res ) return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); @@ -909,17 +860,10 @@ int iomanX_devctl(const char *name, int cmd, void *arg, unsigned int arglen, voi { iomanX_iop_file_t *f; const char *parsefile_res; -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - iomanX_iop_file_t f_stk; -#endif -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - f = &f_stk; -#else f = new_iob(); if ( !f ) return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); -#endif parsefile_res = parsefile(name, &(f->device), &(f->unit)); if ( !parsefile_res ) return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); @@ -934,17 +878,10 @@ int iomanX_readlink(const char *path, char *buf, unsigned int buflen) { iomanX_iop_file_t *f; const char *parsefile_res; -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - iomanX_iop_file_t f_stk; -#endif -#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK - f = &f_stk; -#else f = new_iob(); if ( !f ) return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR); -#endif parsefile_res = parsefile(path, &(f->device), &(f->unit)); if ( !parsefile_res ) return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);