util: rename virGetUserDirectory(ByUID) to virGetUserHomeDirectory(ByUID)

All the other wrapper functions for glib g_get_user_*_dir() have the
type of directory (the "*" in that wildcarded name) in the libvirt
function name. These functions, on the other hand, call
g_get_home_dir(), but the libvirt API is called
virGetUserDirectory*(). Let's make it *a bit* closer to consistent (at
least the libvirt API names will be consistent with each other, even
if glib isn't).

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 19edf7eb127236024e89c7936311e95e58222b91..f5acf46bc0357f9994c13026bfa8281c9fac9635 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3725,8 +3725,8 @@ virGetSystemPageSize;
 virGetSystemPageSizeKB;
 virGetUserCacheDirectory;
 virGetUserConfigDirectory;
-virGetUserDirectory;
-virGetUserDirectoryByUID;
+virGetUserHomeDirectory;
+virGetUserHomeDirectoryByUID;
 virGetUserID;
 virGetUserName;
 virGetUserRuntimeDirectory;

diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c
index 08fb68c90168b77d942fb0e5baaeb954b0da48cf..2280b8a2dffdc18b81e32b091fabecd778fbedc2 100644 (file)
--- a/src/qemu/qemu_interop_config.c
+++ b/src/qemu/qemu_interop_config.c
@@ -105,7 +105,7 @@ qemuInteropFetchConfigs(const char *name,
         xdgConfig = g_strdup(getenv("XDG_CONFIG_HOME"));
 
         if (!xdgConfig) {
-            g_autofree char *home = virGetUserDirectory();
+            g_autofree char *home = virGetUserHomeDirectory();
 
             xdgConfig = g_strdup_printf("%s/.config", home);
         }

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index ee729d5e62e91d3fee479aaa2cc028dced910466..3ad4655e6ef8e932d07424a637e3a0e2368bb397 100644 (file)
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -539,7 +539,7 @@ virNetClient *virNetClientNewLibSSH2(const char *host,
     if (privkeyPath) {
         privkey = g_strdup(privkeyPath);
     } else {
-        homedir = virGetUserDirectory();
+        homedir = virGetUserHomeDirectory();
         if (virNetClientFindDefaultSshKey(homedir, &privkey) < 0)
             return NULL;
     }
@@ -604,7 +604,7 @@ virNetClient *virNetClientNewLibssh(const char *host,
     if (privkeyPath) {
         privkey = g_strdup(privkeyPath);
     } else {
-        homedir = virGetUserDirectory();
+        homedir = virGetUserHomeDirectory();
         if (virNetClientFindDefaultSshKey(homedir, &privkey) < 0)
             return NULL;
     }

diff --git a/src/rpc/virnettlsconfig.c b/src/rpc/virnettlsconfig.c
index eec20cf6b7f77da6c1ca9764cb0a6677dec215de..6ad7a02779dddf86f6b29f26d57c72b38f042d0e 100644 (file)
--- a/src/rpc/virnettlsconfig.c
+++ b/src/rpc/virnettlsconfig.c
@@ -36,7 +36,7 @@ VIR_LOG_INIT("rpc.nettlsconfig");
 
 char *virNetTLSConfigUserPKIBaseDir(void)
 {
-    g_autofree char *userdir = virGetUserDirectory();
+    g_autofree char *userdir = virGetUserHomeDirectory();
 
     return g_strdup_printf("%s/.pki/libvirt", userdir);
 }

diff --git a/src/util/virutil.c b/src/util/virutil.c
index fb64237692bbc729b1f140c3f863494eccdc3739..a6815927b46264fd59cfbc7957f2f5f339352533 100644 (file)
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -589,7 +589,7 @@ virGetHostnameQuiet(void)
 
 
 char *
-virGetUserDirectory(void)
+virGetUserHomeDirectory(void)
 {
     return g_strdup(g_get_home_dir());
 }
@@ -753,7 +753,7 @@ static char *virGetGroupEnt(gid_t gid)
 
 
 char *
-virGetUserDirectoryByUID(uid_t uid)
+virGetUserHomeDirectoryByUID(uid_t uid)
 {
     char *ret;
     virGetUserEnt(uid, NULL, NULL, &ret, NULL, false);
@@ -1091,7 +1091,7 @@ virDoesGroupExist(const char *name G_GNUC_UNUSED)
 
 # ifdef WIN32
 char *
-virGetUserDirectoryByUID(uid_t uid G_GNUC_UNUSED)
+virGetUserHomeDirectoryByUID(uid_t uid G_GNUC_UNUSED)
 {
     /* Since Windows lacks setuid binaries, and since we already fake
      * geteuid(), we can safely assume that this is only called when
@@ -1111,10 +1111,10 @@ virGetUserShell(uid_t uid G_GNUC_UNUSED)
 
 # else /* !WITH_GETPWUID_R && !WIN32 */
 char *
-virGetUserDirectoryByUID(uid_t uid G_GNUC_UNUSED)
+virGetUserHomeDirectoryByUID(uid_t uid G_GNUC_UNUSED)
 {
     virReportError(VIR_ERR_INTERNAL_ERROR,
-                   "%s", _("virGetUserDirectory is not available"));
+                   "%s", _("virGetUserHomeDirectoryByUID is not available"));
 
     return NULL;
 }

diff --git a/src/util/virutil.h b/src/util/virutil.h
index 7e1705e7ce8072ae628244667f5203e406a2e282..2accb5777d2f418159feb03613bdfdeab81b8774 100644 (file)
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -95,8 +95,8 @@ static inline int pthread_sigmask(int how,
 char *virGetHostname(void) ATTRIBUTE_MOCKABLE;
 char *virGetHostnameQuiet(void);
 
-char *virGetUserDirectory(void);
-char *virGetUserDirectoryByUID(uid_t uid);
+char *virGetUserHomeDirectory(void);
+char *virGetUserHomeDirectoryByUID(uid_t uid);
 char *virGetUserConfigDirectory(void);
 char *virGetUserCacheDirectory(void);
 char *virGetUserRuntimeDirectory(void) ATTRIBUTE_MOCKABLE;

diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c
index 56be618fb809cfc0e096a758e26d33d69558b752..72c67d2143a97d77a723c9ee8a130955b18776b3 100644 (file)
--- a/src/vbox/vbox_storage.c
+++ b/src/vbox/vbox_storage.c
@@ -445,7 +445,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool,
 
     /* If target.path isn't given, use default path ~/.VirtualBox/image_name */
     if (!def->target.path) {
-        homedir = virGetUserDirectory();
+        homedir = virGetUserHomeDirectory();
         def->target.path = g_strdup_printf("%s/.VirtualBox/%s", homedir, def->name);
     }
     VBOX_UTF8_TO_UTF16(def->target.path, &hddNameUtf16);

diff --git a/tools/virt-login-shell-helper.c b/tools/virt-login-shell-helper.c
index cb59b5dec0abb84a8dd95885106efc9b6118c93e..a1c68a1afae35d992393dfb939732e360ef4748a 100644 (file)
--- a/tools/virt-login-shell-helper.c
+++ b/tools/virt-login-shell-helper.c
@@ -253,7 +253,7 @@ main(int argc, char **argv)
     if (!name)
         goto cleanup;
 
-    homedir = virGetUserDirectoryByUID(uid);
+    homedir = virGetUserHomeDirectoryByUID(uid);
     if (!homedir)
         goto cleanup;
 

diff --git a/tools/vsh.c b/tools/vsh.c
index 69d3930e43f62922f568f9c9733e15612aa93929..18914cc81864b65c5a251806c12556918a06572d 100644 (file)
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -3333,7 +3333,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd)
     g_autofree char *dir_malloced = NULL;
 
     if (vshCommandOptStringQuiet(ctl, cmd, "dir", &dir) <= 0)
-        dir = dir_malloced = virGetUserDirectory();
+        dir = dir_malloced = virGetUserHomeDirectory();
     if (!dir)
         dir = "/";