summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-04-05 18:44:55 +0100
committerRichard W.M. Jones <rjones@redhat.com>2011-04-11 11:09:36 +0100
commit57261c712d7012e858f93d040938750866bd6ae0 (patch)
tree504bebc99c0e66d88977422ddb9d936493baed67
parent3bc613e9255db67f155deb8980cb5f75b0139041 (diff)
downloadlibguestfs-57261c712d7012e858f93d040938750866bd6ae0.tar.gz
libguestfs-57261c712d7012e858f93d040938750866bd6ae0.tar.xz
libguestfs-57261c712d7012e858f93d040938750866bd6ae0.zip
Rename resolve_windows_path_silently to case_sensitive_path_silently.
A more accurate description of what this function does. This is just code motion. (cherry picked from commit f3eea44f97340f747e46b0df6931a04b53abaf01)
-rw-r--r--src/inspect.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/inspect.c b/src/inspect.c
index f3cc54ef..900b6f41 100644
--- a/src/inspect.c
+++ b/src/inspect.c
@@ -228,7 +228,7 @@ static int check_windows_root (guestfs_h *g, struct inspect_fs *fs);
static int check_windows_arch (guestfs_h *g, struct inspect_fs *fs);
static int check_windows_software_registry (guestfs_h *g, struct inspect_fs *fs);
static int check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs);
-static char *resolve_windows_path_silently (guestfs_h *g, const char *);
+static char *case_sensitive_path_silently (guestfs_h *g, const char *);
static int is_file_nocase (guestfs_h *g, const char *);
static int is_dir_nocase (guestfs_h *g, const char *);
static int extend_fses (guestfs_h *g);
@@ -1034,7 +1034,7 @@ check_windows_root (guestfs_h *g, struct inspect_fs *fs)
for (i = 0;
systemroot == NULL && i < sizeof systemroots / sizeof systemroots[0];
++i) {
- systemroot = resolve_windows_path_silently (g, systemroots[i]);
+ systemroot = case_sensitive_path_silently (g, systemroots[i]);
}
if (!systemroot) {
@@ -1072,7 +1072,7 @@ check_windows_arch (guestfs_h *g, struct inspect_fs *fs)
char cmd_exe[len];
snprintf (cmd_exe, len, "%s/system32/cmd.exe", fs->windows_systemroot);
- char *cmd_exe_path = resolve_windows_path_silently (g, cmd_exe);
+ char *cmd_exe_path = case_sensitive_path_silently (g, cmd_exe);
if (!cmd_exe_path)
return 0;
@@ -1099,7 +1099,7 @@ check_windows_software_registry (guestfs_h *g, struct inspect_fs *fs)
snprintf (software, len, "%s/system32/config/software",
fs->windows_systemroot);
- char *software_path = resolve_windows_path_silently (g, software);
+ char *software_path = case_sensitive_path_silently (g, software);
if (!software_path)
/* If the software hive doesn't exist, just accept that we cannot
* find product_name etc.
@@ -1208,7 +1208,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs)
snprintf (system, len, "%s/system32/config/system",
fs->windows_systemroot);
- char *system_path = resolve_windows_path_silently (g, system);
+ char *system_path = case_sensitive_path_silently (g, system);
if (!system_path)
/* If the system hive doesn't exist, just accept that we cannot
* find hostname etc.
@@ -1283,7 +1283,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs)
}
static char *
-resolve_windows_path_silently (guestfs_h *g, const char *path)
+case_sensitive_path_silently (guestfs_h *g, const char *path)
{
guestfs_error_handler_cb old_error_cb = g->error_cb;
g->error_cb = NULL;
@@ -1298,7 +1298,7 @@ is_file_nocase (guestfs_h *g, const char *path)
char *p;
int r;
- p = resolve_windows_path_silently (g, path);
+ p = case_sensitive_path_silently (g, path);
if (!p)
return 0;
r = guestfs_is_file (g, p);
@@ -1312,7 +1312,7 @@ is_dir_nocase (guestfs_h *g, const char *path)
char *p;
int r;
- p = resolve_windows_path_silently (g, path);
+ p = case_sensitive_path_silently (g, path);
if (!p)
return 0;
r = guestfs_is_dir (g, p);
@@ -2002,7 +2002,7 @@ list_applications_windows (guestfs_h *g, struct inspect_fs *fs)
snprintf (software, len, "%s/system32/config/software",
fs->windows_systemroot);
- char *software_path = resolve_windows_path_silently (g, software);
+ char *software_path = case_sensitive_path_silently (g, software);
if (!software_path)
/* If the software hive doesn't exist, just accept that we cannot
* find product_name etc.