python: Use guestfs___free_string_list instead of custom version.

This commit is contained in:
Richard W.M. Jones
2013-02-20 20:00:04 +00:00
parent 4ede94ab7b
commit 907fbfff53
2 changed files with 8 additions and 13 deletions

View File

@@ -137,16 +137,6 @@ put_table (char * const * const argv)
return list;
}
static void
free_strings (char **argv)
{
size_t argc;
for (argc = 0; argv[argc] != NULL; ++argc)
free (argv[argc]);
free (argv);
}
";
let emit_put_list_function typ =
@@ -485,7 +475,7 @@ free_strings (char **argv)
pr " free (r);\n"
| RStringList _ ->
pr " py_r = put_string_list (r);\n";
pr " free_strings (r);\n"
pr " guestfs___free_string_list (r);\n"
| RStruct (_, typ) ->
pr " py_r = put_%s (r);\n" typ;
pr " guestfs_free_%s (r);\n" typ
@@ -494,7 +484,7 @@ free_strings (char **argv)
pr " guestfs_free_%s_list (r);\n" typ
| RHashtable n ->
pr " py_r = put_table (r);\n";
pr " free_strings (r);\n"
pr " guestfs___free_string_list (r);\n"
| RBufferOut _ ->
pr "#ifdef HAVE_PYSTRING_ASSTRING\n";
pr " py_r = PyString_FromStringAndSize (r, size);\n";

View File

@@ -49,7 +49,12 @@ libguestfsmod_la_CPPFLAGS = \
libguestfsmod_la_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS)
libguestfsmod_la_LIBADD = $(top_builddir)/src/libguestfs.la
libguestfsmod_la_LIBADD = \
$(top_builddir)/src/libutils.la \
$(top_builddir)/src/libguestfs.la \
$(LIBXML2_LIBS) \
$(LIBVIRT_LIBS) \
../gnulib/lib/libgnu.la
libguestfsmod_la_LDFLAGS = -avoid-version -shared