From 3bfe72e3dd87d8c0620290e0dc3f2d42dda2e73f Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Mon, 30 Apr 2018 17:23:08 +0200 Subject: [PATCH] tests: Stop mocking canonicalize_file_name() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We're using virFileCanonicalizePath() everywhere now, so mocking this function has become entirely pointless. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrangé --- tests/virpcimock.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 3d3a4b4a19..79352175de 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -39,7 +39,6 @@ static int (*real_lstat)(const char *path, struct stat *sb); static int (*real___lxstat)(int ver, const char *path, struct stat *sb); static int (*real_stat)(const char *path, struct stat *sb); static int (*real___xstat)(int ver, const char *path, struct stat *sb); -static char *(*real_canonicalize_file_name)(const char *path); static int (*real_open)(const char *path, int flags, ...); static int (*real_close)(int fd); static DIR * (*real_opendir)(const char *name); @@ -811,7 +810,6 @@ init_syms(void) VIR_MOCK_REAL_INIT(access); VIR_MOCK_REAL_INIT_ALT(lstat, __lxstat); VIR_MOCK_REAL_INIT_ALT(stat, __xstat); - VIR_MOCK_REAL_INIT(canonicalize_file_name); VIR_MOCK_REAL_INIT(open); VIR_MOCK_REAL_INIT(close); VIR_MOCK_REAL_INIT(opendir); @@ -969,25 +967,6 @@ stat(const char *path, struct stat *sb) return ret; } -char * -canonicalize_file_name(const char *path) -{ - char *ret; - - init_syms(); - - if (STRPREFIX(path, SYSFS_PCI_PREFIX)) { - char *newpath; - if (getrealpath(&newpath, path) < 0) - return NULL; - ret = real_canonicalize_file_name(newpath); - VIR_FREE(newpath); - } else { - ret = real_canonicalize_file_name(path); - } - return ret; -} - int open(const char *path, int flags, ...) {