From f1960238411d0a7286ed279749968398df83e10f Mon Sep 17 00:00:00 2001 From: CodingKoopa Date: Fri, 8 Mar 2024 06:25:49 +0000 Subject: [PATCH] utils.h: remove compat macros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It might be worth figuring out a more proper fix than this. Fixes compiler error: In file included from ntfswipe.c:63: ntfswipe.c: In function ‘version’: utils.h:113:58: error: expected expression before ‘)’ token 113 | ntfs_utils_reformat(_b,MAX_FMT,fmt), args); } while (0) | ^ ../include/ntfs-3g/logging.h:95:40: note: in expansion of macro ‘ntfs_log_redirect’ 95 | #define ntfs_log_info(FORMAT, ARGS...) ntfs_log_redirect(__FUNCTION__,__FILE__,__LINE__,NTFS_LOG_LEVEL_INFO,NULL,FORMAT,##ARGS) | ^~~~~~~~~~~~~~~~~ --- ntfsprogs/utils.h | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/ntfsprogs/utils.h b/ntfsprogs/utils.h index 6335924e..3974da00 100644 --- a/ntfsprogs/utils.h +++ b/ntfsprogs/utils.h @@ -101,27 +101,6 @@ int mft_next_record(struct mft_search_ctx *ctx); #define MAX_PATH 1024 #endif -#ifdef HAVE_WINDOWS_H -/* - * Macroes to hide the needs to translate formats on older Windows - */ -#define MAX_FMT 1536 -char *ntfs_utils_reformat(char *out, int sz, const char *fmt); -char *ntfs_utils_unix_path(const char *in); -#define ntfs_log_redirect(fn,fi,li,le,d,fmt, args...) \ - do { char _b[MAX_FMT]; ntfs_log_redirect(fn,fi,li,le,d, \ - ntfs_utils_reformat(_b,MAX_FMT,fmt), args); } while (0) -#define printf(fmt, args...) \ - do { char _b[MAX_FMT]; \ - printf(ntfs_utils_reformat(_b,MAX_FMT,fmt), args); } while (0) -#define fprintf(str, fmt, args...) \ - do { char _b[MAX_FMT]; \ - fprintf(str, ntfs_utils_reformat(_b,MAX_FMT,fmt), args); } while (0) -#define vfprintf(file, fmt, args) \ - do { char _b[MAX_FMT]; vfprintf(file, \ - ntfs_utils_reformat(_b,MAX_FMT,fmt), args); } while (0) -#endif - /** * linux-ntfs's ntfs_mbstoucs has different semantics, so we emulate it with * ntfs-3g's.