From: Geoff Levand Date: Sat, 7 Feb 2009 18:35:54 +0000 (+0000) Subject: Remove boot_option_copy routine X-Git-Tag: v1.0.0~914 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=9bde93d47a288769167a3e283c632d826e7b558e;hp=1bb9ed4ffbbd1b186b30702d3c4104d5597d0888 Remove boot_option_copy routine Remove the now uneeded boot_option_copy() routine. The addition of persistant client device and boot option info make this routine uneeded. Signed-off-by: Geoff Levand Signed-off-by: Jeremy Kerr --- diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 69c9bfe..79a8308 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -38,26 +38,6 @@ * 4-byte len, id */ -/* Deep copy a boot_option. -*/ -struct boot_option *boot_option_copy(void* ctx, const struct boot_option *opt) -{ - struct boot_option *new = talloc(ctx, struct boot_option); - - if (new) { - new->id = talloc_strdup(new, opt->id); - new->name = talloc_strdup(new, opt->name); - new->description = talloc_strdup(new, opt->description); - new->icon_file = talloc_strdup(new, opt->icon_file); - new->boot_image_file = talloc_strdup(new, opt->boot_image_file); - new->initrd_file = talloc_strdup(new, opt->initrd_file); - new->boot_args = talloc_strdup(new, opt->boot_args); - memset(&new->list, 0, sizeof(new->list)); - } - - return new; -} - int pb_protocol_device_cmp(const struct device *a, const struct device *b) { return !strcmp(a->id, b->id); diff --git a/lib/pb-protocol/pb-protocol.h b/lib/pb-protocol/pb-protocol.h index fa5dd86..972f8f1 100644 --- a/lib/pb-protocol/pb-protocol.h +++ b/lib/pb-protocol/pb-protocol.h @@ -45,8 +45,6 @@ struct boot_option { void *ui_info; }; -struct boot_option *boot_option_copy(void* ctx, const struct boot_option *opt); - int pb_protocol_device_len(const struct device *dev); int pb_protocol_device_cmp(const struct device *a, const struct device *b);