External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Drop virFileMakePath() and virFileMakePathWithMode()

Browse Source 
These functions are now unused.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2021-02-26 09:30:07 +01:00
parent 7f482a67e4
commit f81d504b71
3 changed files with 1 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvirt_private.syms
View File

@ -2201,8 +2201,6 @@ virFileLinkPointsTo;
virFileLock;
virFileLoopDeviceAssociate;
virFileMakeParentPath;
virFileMakePath;
virFileMakePathWithMode;
virFileMoveMount;
virFileNBDDeviceAssociate;
virFileOpenAs;

65
src/util/virfile.c
View File

@ -3031,69 +3031,6 @@ int virFileChownFiles(const char *name,
}
#endif /* WIN32 */
static int
virFileMakePathHelper(char *path, mode_t mode)
{
struct stat st;
char *p;
VIR_DEBUG("path=%s mode=0%o", path, mode);
if (stat(path, &st) >= 0) {
if (S_ISDIR(st.st_mode))
return 0;
errno = ENOTDIR;
return -1;
}
if (errno != ENOENT)
return -1;
if ((p = strrchr(path, '/')) == NULL) {
errno = EINVAL;
return -1;
}
if (p != path) {
*p = '\0';
if (virFileMakePathHelper(path, mode) < 0)
return -1;
*p = '/';
}
if (g_mkdir(path, mode) < 0 && errno != EEXIST)
return -1;
return 0;
}
/**
* Creates the given directory with mode 0777 if it's not already existing.
*
* Returns 0 on success, or -1 if an error occurred (in which case, errno
* is set appropriately).
*/
int
virFileMakePath(const char *path)
{
return g_mkdir_with_parents(path, 0777);
}
int
virFileMakePathWithMode(const char *path,
mode_t mode)
{
g_autofree char *tmp = NULL;
tmp = g_strdup(path);
return virFileMakePathHelper(tmp, mode);
}
int
virFileMakeParentPath(const char *path)
{
@ -3110,7 +3047,7 @@ virFileMakeParentPath(const char *path)
}
*p = '\0';
return virFileMakePathHelper(tmp, 0777);
return g_mkdir_with_parents(tmp, 0777);
}

3
src/util/virfile.h
View File

@ -277,9 +277,6 @@ int virDirRead(DIR *dirp, struct dirent **ent, const char *dirname)
void virDirClose(DIR *dirp);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(DIR, virDirClose);
int virFileMakePath(const char *path) G_GNUC_WARN_UNUSED_RESULT;
int virFileMakePathWithMode(const char *path,
mode_t mode) G_GNUC_WARN_UNUSED_RESULT;
int virFileMakeParentPath(const char *path) G_GNUC_WARN_UNUSED_RESULT;
char *virFileBuildPath(const char *dir,