[Libguestfs] [PATCH v2 3/5] daemon: switch from read_file to read_whole_file

Since we have already an helper to read a file, use it instead of the gnulib function. --- daemon/ntfsclone.c | 4 +--- daemon/tar.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/daemon/ntfsclone.c b/daemon/ntfsclone.c index 2e481eb94..3c0d10fc5 100644 --- a/daemon/ntfsclone.c +++ b/daemon/ntfsclone.c @@ -26,8 +26,6 @@ #include <errno.h> #include <error.h> -#include "read-file.h" - #include "daemon.h" #include "actions.h" #include "optgroups.h" @@ -39,7 +37,7 @@ read_error_file (char *error_file) size_t len; char *str; - str = read_file (error_file, &len); + str = read_whole_file (error_file, &len); if (str == NULL) { str = strdup ("(no error)"); if (str == NULL) diff --git a/daemon/tar.c b/daemon/tar.c index 300e99448..daad75a47 100644 --- a/daemon/tar.c +++ b/daemon/tar.c @@ -28,8 +28,6 @@ #include <sys/types.h> #include <sys/stat.h> -#include "read-file.h" - #include "guestfs_protocol.h" #include "daemon.h" #include "actions.h" @@ -107,7 +105,7 @@ read_error_file (char *error_file) size_t len; char *str; - str = read_file (error_file, &len); + str = read_whole_file (error_file, &len); if (str == NULL) { str = strdup ("(no error)"); if (str == NULL) -- 2.21.0