Remove boot_option_copy routine

[petitboot] / lib / pb-protocol / pb-protocol.c

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 0252b9aaa18bf12c3c2d46efa920f0171a013218..79a8308e8a05f11c5145d0c272a1ac1f6b41b7a1 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -38,24 +38,15 @@
  *   4-byte len, id
  */
 
-/* Deep copy a boot_option.
-*/
-struct boot_option *boot_option_copy(void* ctx, const struct boot_option *opt)
+int pb_protocol_device_cmp(const struct device *a, const struct device *b)
 {
-       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 !strcmp(a->id, b->id);
+}
 
-       return new;
+int pb_protocol_boot_option_cmp(const struct boot_option *a,
+       const struct boot_option *b)
+{
+       return !strcmp(a->id, b->id);
 }
 
 /* Write a string into the buffer, starting at pos.
@@ -85,7 +76,8 @@ int pb_protocol_serialise_string(char *pos, const char *str)
  * @param[out] str     Pointer to resuling string
  * @return             zero on success, non-zero on failure
  */
-static int read_string(void *ctx, char **pos, unsigned int *len, char **str)
+static int read_string(void *ctx, const char **pos, unsigned int *len,
+       char **str)
 {
        uint32_t str_len, read_len;
 
@@ -113,9 +105,10 @@ static int read_string(void *ctx, char **pos, unsigned int *len, char **str)
 }
 
 char *pb_protocol_deserialise_string(void *ctx,
-               struct pb_protocol_message *message)
+               const struct pb_protocol_message *message)
 {
-       char *buf, *str;
+       const char *buf;
+       char *str;
        unsigned int len;
 
        len = message->payload_len;
@@ -134,7 +127,7 @@ static int optional_strlen(const char *str)
        return strlen(str);
 }
 
-int pb_protocol_device_len(struct device *dev)
+int pb_protocol_device_len(const struct device *dev)
 {
        struct boot_option *opt;
        int len;
@@ -158,7 +151,7 @@ int pb_protocol_device_len(struct device *dev)
        return len;
 }
 
-int pb_protocol_serialise_device(struct device *dev, char *buf, int buf_len)
+int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_len)
 {
        struct boot_option *opt;
        uint32_t n;
@@ -277,10 +270,10 @@ struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd)
 
 
 struct device *pb_protocol_deserialise_device(void *ctx,
-               struct pb_protocol_message *message)
+               const struct pb_protocol_message *message)
 {
        struct device *dev;
-       char *pos;
+       const char *pos;
        int i, n_options;
        unsigned int len;