Add protocol object compare routines

[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..69c9bfea63e5017051e9a66509c9aa9fc36c02bc 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -58,6 +58,17 @@ struct boot_option *boot_option_copy(void* ctx, const struct boot_option *opt)
        return new;
 }
 
+int pb_protocol_device_cmp(const struct device *a, const struct device *b)
+{
+       return !strcmp(a->id, b->id);
+}
+
+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.
  *
  * Returns the total length used for the write, including length header.
@@ -85,7 +96,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 +125,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 +147,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 +171,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 +290,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;