X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Fprep.c;h=9863bc9699e119c3c339f134ef7a749792e8cfe7;hb=47963bc9cc0b47af0541010a4fa14260405acaa5;hp=59fa8a7ac7becbf1b53f26c434073b12428beaef;hpb=fa918b166acd6123623fd0d03b5f4840b1579a02;p=libguestfs.git diff --git a/fish/prep.c b/fish/prep.c index 59fa8a7..9863bc9 100644 --- a/fish/prep.c +++ b/fish/prep.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 @@ -38,7 +38,7 @@ list_prepared_drives (void) for (i = 0; i < NR_PREPS; ++i) { printf (_("\ -guestfish -N %-16s %s\n\ +guestfish -N %-8s - %s\n\ \n\ %s\n"), preps[i].name, preps[i].shortdesc, preps[i].longdesc); @@ -116,7 +116,7 @@ Use 'guestfish -N help' to list possible values for the -N parameter.\n"), } for (i = 0; i < data->prep->nr_params; ++i) - data->params[i] = data->prep->params[i].pdefault; + data->params[i] = bad_cast (data->prep->params[i].pdefault); /* Parse the optional parameters. */ const char *p = type_string + len; @@ -167,3 +167,16 @@ prep_error (prep_data *data, const char *filename, const char *fs, ...) exit (EXIT_FAILURE); } + +void +free_prep_data (void *vp) +{ + prep_data *data = vp; + size_t i; + + for (i = 0; i < data->prep->nr_params; ++i) + if (data->params[i] != data->prep->params[i].pdefault) + free (data->params[i]); + free (data->params); + free (data); +}