X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Finspect.c;h=98329ee59151b805ffbcb773fa6126a13951941b;hb=1a35ca59088e572c11633e85524bb282cb436186;hp=07af81882a1e15cf50a559533358e2eaa788f902;hpb=fa44536b0ff12102c72ae0337e51d272f0fc2353;p=libguestfs.git diff --git a/fish/inspect.c b/fish/inspect.c index 07af818..98329ee 100644 --- a/fish/inspect.c +++ b/fish/inspect.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include @@ -43,14 +43,14 @@ free_strings (char **argv) free (argv); } -static int +static size_t count_strings (char *const *argv) { - int c; + size_t i; - for (c = 0; argv[c]; ++c) + for (i = 0; argv[i]; ++i) ; - return c; + return i; } static int @@ -88,12 +88,14 @@ inspect_mount (void) if (roots[0] == NULL) { fprintf (stderr, _("%s: no operating system was found on this disk\n"), program_name); + free_strings (roots); exit (EXIT_FAILURE); } if (roots[1] != NULL) { fprintf (stderr, _("%s: multi-boot operating systems are not supported by the -i option\n"), program_name); + free_strings (roots); exit (EXIT_FAILURE); }