From 50db0f7367ce6ab8547c77feda05a0ea0a66d30c Mon Sep 17 00:00:00 2001 From: Vitaliy Cherepanov Date: Thu, 10 Nov 2016 18:32:51 +0300 Subject: [PATCH] Fix file io probes handlers replace wrong original function calls Change-Id: Ib9f4810034be9fbda9c56d5985fadf55128f70d4 Signed-off-by: Vitaliy Cherepanov --- probe_file/da_io_stdc.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/probe_file/da_io_stdc.c b/probe_file/da_io_stdc.c index 64ab397..2742c7a 100644 --- a/probe_file/da_io_stdc.c +++ b/probe_file/da_io_stdc.c @@ -595,14 +595,12 @@ DEF_WAV(int, fprintf, FILE*, stream, const char*, format, ...) DEF_H(int, fprintf, FILE*, stream, const char*, format, va_list, args) { // static int (*vfprintfp)(FILE* stream, const char* format, ...); - int (*vfprintfp)(FILE* stream, const char* format, ...); BEFORE_ORIGINAL_START_END_FILEP(API_ID_fprintf, 'd', vfprintf, LIBC, stream, FD_API_WRITE_START, "ps", voidp_to_uint64(stream), format); - vfprintfp = (void *)orig; - ret = vfprintfp(stream, format, args); + ret = vfprintf(stream, format, args); AFTER_ORIGINAL_START_END_FILEP(API_ID_fprintf, 'd', ret, ret, stream, FD_API_WRITE_END, "ps", @@ -654,14 +652,12 @@ DEF_WAV(int, fscanf, FILE*, stream, const char*, format, ...) DEF_H(int, fscanf, FILE*, stream, const char*, format, va_list, args) { // static int (*vfscanfp)(FILE* stream, const char* format, ...); - int (*vfscanfp)(FILE* stream, const char* format, ...); BEFORE_ORIGINAL_START_END_FILEP(API_ID_fscanf, 'd', vfscanf, LIBC, stream, FD_API_READ_START, "ps", voidp_to_uint64(stream), format); - vfscanfp = (void *)orig; - ret = vfscanfp(stream, format, args); + ret = vfscanf(stream, format, args); AFTER_ORIGINAL_START_END_FILEP(API_ID_fscanf, 'd', ret, ret, stream, FD_API_READ_END, "ps", @@ -713,13 +709,11 @@ DEF_WAV(int, printf, const char*, format, ...) DEF_H(int, printf, const char*, format, va_list, args) { // static int (*vprintfp)(const char* format, ...); - int (*vprintfp)(const char* format, ...); BEFORE_ORIGINAL_START_END_NOFD(API_ID_printf, 'd', vprintf, LIBC, FD_API_WRITE_START, "s", format); - vprintfp = (void *)orig; - ret = vprintfp(format, args); + ret = vprintf(format, args); AFTER_ORIGINAL_START_END_NOFD(API_ID_printf, 'd', ret, ret, FD_API_WRITE_END, "s", format); @@ -770,13 +764,11 @@ DEF_WAV(int, scanf, const char*, format, ...) DEF_H(int, scanf, const char*, format, va_list, args) { // static int (*vscanfp)(const char* format, ...); - int (*vscanfp)(const char* format, ...); BEFORE_ORIGINAL_START_END_NOFD(API_ID_scanf, 'd', vscanf, LIBC, FD_API_READ_START, "s", format); - vscanfp = (void *)orig; - ret = vscanfp(format, args); + ret = vscanf(format, args); AFTER_ORIGINAL_START_END_NOFD(API_ID_scanf, 'd', ret, ret, FD_API_READ_END, "s", format); -- 2.7.4