From 50e3f8f88f03e7b8f72e81efbd6461eefeba2a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 18 Dec 2019 21:13:16 +0100 Subject: [PATCH] util: Remove VIR_FILE_*_SEPARATOR* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit None of those are used and we should prefer using the ones provided by GLib, as G_DIR_SEPARATOR, G_DIR_SEPARATOR_S, G_SEARCHPATH_SEPARATOR, and G_SEARCHPATH_SEPARATOR_S. Signed-off-by: Fabiano Fidêncio Reviewed-by: Cole Robinson --- src/util/virfile.h | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/util/virfile.h b/src/util/virfile.h index 3fd1795813..264b12c03d 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -278,25 +278,6 @@ char *virFileBuildPath(const char *dir, const char *ext) G_GNUC_WARN_UNUSED_RESULT; -#ifdef WIN32 -/* On Win32, the canonical directory separator is the backslash, and - * the search path separator is the semicolon. Note that also the - * (forward) slash works as directory separator. - */ -# define VIR_FILE_DIR_SEPARATOR '\\' -# define VIR_FILE_DIR_SEPARATOR_S "\\" -# define VIR_FILE_PATH_SEPARATOR ';' -# define VIR_FILE_PATH_SEPARATOR_S ";" - -#else /* !WIN32 */ - -# define VIR_FILE_DIR_SEPARATOR '/' -# define VIR_FILE_DIR_SEPARATOR_S "/" -# define VIR_FILE_PATH_SEPARATOR ':' -# define VIR_FILE_PATH_SEPARATOR_S ":" - -#endif /* !WIN32 */ - int virFileAbsPath(const char *path, char **abspath) G_GNUC_WARN_UNUSED_RESULT; void virFileRemoveLastComponent(char *path); -- GitLab