search for: nr_names

...nrdevices, spare); return -1; } diff --git a/daemon/stat.c b/daemon/stat.c index 73f19226b..a1cd49245 100644 --- a/daemon/stat.c +++ b/daemon/stat.c @@ -127,7 +127,7 @@ do_internal_lstatnslist (const char *path, char *const *names) guestfs_int_statns_list *ret; size_t i, nr_names; - nr_names = count_strings (names); + nr_names = guestfs_int_count_strings (names); ret = malloc (sizeof *ret); if (!ret) { diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES index 18671b9a1..61cdbea38 100644 --- a/docs/C_SOURCE_FILES +++ b/docs/C_SOURCE_FILES @@ -74,7 +74,6 @@ dae...

...NULL, &statbuf); } -guestfs_int_stat_list * -do_internal_lstatlist (const char *path, char *const *names) +guestfs_int_statns_list * +do_internal_lstatnslist (const char *path, char *const *names) { int path_fd; - guestfs_int_stat_list *ret; + guestfs_int_statns_list *ret; size_t i, nr_names; nr_names = count_strings (names); @@ -138,9 +134,10 @@ do_internal_lstatlist (const char *path, char *const *names) reply_with_perror ("malloc"); return NULL; } - ret->guestfs_int_stat_list_len = nr_names; - ret->guestfs_int_stat_list_val = calloc (nr_names, siz...

...c"); free (ret); return NULL; } diff --git a/daemon/stat.c b/daemon/stat.c index a784914..73f1922 100644 --- a/daemon/stat.c +++ b/daemon/stat.c @@ -138,7 +138,7 @@ do_internal_lstatnslist (const char *path, char *const *names) ret->guestfs_int_statns_list_val = calloc (nr_names, sizeof (guestfs_int_statns)); if (ret->guestfs_int_statns_list_val == NULL) { - reply_with_perror ("malloc"); + reply_with_perror ("calloc"); free (ret); return NULL; } diff --git a/daemon/xattr.c b/daemon/xattr.c index c32e1a7..8aa28d1 100644 --- a/dae...

This is just the utilities part of the patch series from: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html I believe this addresses everything raised in comments on that patch series. Rich.

This turned out to be rather more involved than I thought. We have lots of utility functions, spread all over the repository, with not a lot of structure. This moves many of them under common/ and structures them so there are clear dependencies. This doesn't complete the job by any means. Other items I had on my to-do list for this change were: - Split up mllib/common_utils into: -

This is a combination of: https://www.redhat.com/archives/libguestfs/2017-June/msg00046.html [PATCH 00/12] Refactor utility functions. plus: https://www.redhat.com/archives/libguestfs/2017-June/msg00023.html [PATCH v3 00/19] Allow APIs to be implemented in OCaml. with the second patches rebased on top of the utility refactoring, and some other adjustments and extensions. This passes

v5: https://www.redhat.com/archives/libguestfs/2017-June/msg00065.html Since v5, this now implements inspection almost completely for Linux and Windows guests. Rich.

v7 was: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html https://www.redhat.com/archives/libguestfs/2017-June/msg00184.html I believe this addresses all comments received so far. Also it now passes a test where I compared about 100 disk images processed with old and new virt-inspector binaries. The output is identical in all cases except one which is caused by a bug in blkid