X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Finspect.c;h=b06c8f68228da789fb2cd68d5bbbd0cd06ca6943;hp=e7b1e41375bd1a0df5c41448001670413b64cf10;hb=53c524819323dcea8d5e3d56ff4fc6cf49b6c64f;hpb=f0c28b391c2ca6d8be4b7b7313042a6b3eb4dc8c diff --git a/src/inspect.c b/src/inspect.c index e7b1e41..b06c8f6 100644 --- a/src/inspect.c +++ b/src/inspect.c @@ -423,28 +423,11 @@ guestfs__inspect_os (guestfs_h *g) /* At this point we have, in the handle, a list of all filesystems * found and data about each one. Now we assemble the list of * filesystems which are root devices and return that to the user. + * Fall through to guestfs__inspect_get_roots to do that. */ - size_t count = 0; - for (i = 0; i < g->nr_fses; ++i) - if (g->fses[i].is_root) - count++; - - char **ret = calloc (count+1, sizeof (char *)); - if (ret == NULL) { - perrorf (g, "calloc"); + char **ret = guestfs__inspect_get_roots (g); + if (ret == NULL) guestfs___free_inspect_info (g); - return NULL; - } - - count = 0; - for (i = 0; i < g->nr_fses; ++i) { - if (g->fses[i].is_root) { - ret[count] = safe_strdup (g, g->fses[i].device); - count++; - } - } - ret[count] = NULL; - return ret; } @@ -1307,6 +1290,37 @@ search_for_root (guestfs_h *g, const char *root) return NULL; } +char ** +guestfs__inspect_get_roots (guestfs_h *g) +{ + /* NB. Doesn't matter if g->nr_fses == 0. We just return an empty + * list in this case. + */ + + size_t i; + size_t count = 0; + for (i = 0; i < g->nr_fses; ++i) + if (g->fses[i].is_root) + count++; + + char **ret = calloc (count+1, sizeof (char *)); + if (ret == NULL) { + perrorf (g, "calloc"); + return NULL; + } + + count = 0; + for (i = 0; i < g->nr_fses; ++i) { + if (g->fses[i].is_root) { + ret[count] = safe_strdup (g, g->fses[i].device); + count++; + } + } + ret[count] = NULL; + + return ret; +} + char * guestfs__inspect_get_type (guestfs_h *g, const char *root) {