Make device instance constant

Make the instance of devices read-only.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 9e40fb1d71cd09b86dd7fbfcb92248f6cb00548b..8a4930e1efd565d8487f88875b26774adddcc882 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -55,7 +55,7 @@ static struct device device = {
 
 int device_handler_get_current_devices(
                struct device_handler *handler __attribute__((unused)),
 
 int device_handler_get_current_devices(
                struct device_handler *handler __attribute__((unused)),

-               struct device **devices)
+               const struct device **devices)

 
 {
        *devices = &device;
 
 {
        *devices = &device;

diff --git a/discover/device-handler.h b/discover/device-handler.h
index cd28420a4056ae2a5318715514fb7e65b21b6bb7..01179f289667af56147ceee468ed6933a429a11f 100644 (file)
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -25,7 +25,7 @@ struct device_handler *device_handler_init(struct discover_server *server);
 void device_handler_destroy(struct device_handler *devices);
 
 int device_handler_get_current_devices(struct device_handler *handler,
 void device_handler_destroy(struct device_handler *devices);
 
 int device_handler_get_current_devices(struct device_handler *handler,

-               struct device **devices);
+               const struct device **devices);

 
 int device_handler_event(struct device_handler *handler,
                struct udev_event *event);
 
 int device_handler_event(struct device_handler *handler,
                struct udev_event *event);

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 56a427b85ac9806a11ff20a9dd34b1bd53eaecfc..e03a44a6ba8b564e306ff519169f2c74c7f22ea9 100644 (file)
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -90,7 +90,7 @@ static int client_write_message(
 }
 
 static int write_add_message(struct discover_server *server,
 }
 
 static int write_add_message(struct discover_server *server,

-               struct client *client, struct device *dev)
+               struct client *client, const struct device *dev)

 {
        struct pb_protocol_message *message;
        int len;
 {
        struct pb_protocol_message *message;
        int len;


@@ -128,7 +128,7 @@ static int write_remove_message(struct discover_server *server,
 static int discover_server_process(void *arg)
 {
        struct discover_server *server = arg;
 static int discover_server_process(void *arg)
 {
        struct discover_server *server = arg;

-       struct device *devices;
+       const struct device *devices;

        struct client *client;
        int fd, i, n_devices;
 
        struct client *client;
        int fd, i, n_devices;
 

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 0252b9aaa18bf12c3c2d46efa920f0171a013218..4daeb5a3bc35510a757ccf76f9e13bb3f8c12aab 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -85,7 +85,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
  */
  * @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;
 
 {
        uint32_t str_len, read_len;
 


@@ -113,9 +114,10 @@ static int read_string(void *ctx, char **pos, unsigned int *len, char **str)
 }
 
 char *pb_protocol_deserialise_string(void *ctx,
 }
 
 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;
        unsigned int len;
 
        len = message->payload_len;


@@ -134,7 +136,7 @@ static int optional_strlen(const char *str)
        return strlen(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;
 {
        struct boot_option *opt;
        int len;


@@ -158,7 +160,7 @@ int pb_protocol_device_len(struct device *dev)
        return len;
 }
 
        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;
 {
        struct boot_option *opt;
        uint32_t n;


@@ -277,10 +279,10 @@ struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd)
 
 
 struct device *pb_protocol_deserialise_device(void *ctx,
 
 
 struct device *pb_protocol_deserialise_device(void *ctx,

-               struct pb_protocol_message *message)
+               const struct pb_protocol_message *message)

 {
        struct device *dev;
 {
        struct device *dev;

-       char *pos;
+       const char *pos;

        int i, n_options;
        unsigned int len;
 
        int i, n_options;
        unsigned int len;
 

diff --git a/lib/pb-protocol/pb-protocol.h b/lib/pb-protocol/pb-protocol.h
index c8ce36bb328d7944ddd29c2c4558da37a065dbb7..36dbf00b223a3d3ef59d3288792b82074dc8cf84 100644 (file)
--- a/lib/pb-protocol/pb-protocol.h
+++ b/lib/pb-protocol/pb-protocol.h
@@ -43,13 +43,13 @@ struct boot_option {
 
 struct boot_option *boot_option_copy(void* ctx, const struct boot_option *opt);
 
 
 struct boot_option *boot_option_copy(void* ctx, const struct boot_option *opt);
 

-int pb_protocol_device_len(struct device *dev);
+int pb_protocol_device_len(const struct device *dev);

 
 int pb_protocol_serialise_string(char *pos, const char *str);
 char *pb_protocol_deserialise_string(void *ctx,
 
 int pb_protocol_serialise_string(char *pos, const char *str);
 char *pb_protocol_deserialise_string(void *ctx,

-               struct pb_protocol_message *message);
+               const struct pb_protocol_message *message);

 
 

-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);

 
 int pb_protocol_write_message(int fd, struct pb_protocol_message *message);
 
 
 int pb_protocol_write_message(int fd, struct pb_protocol_message *message);
 


@@ -59,6 +59,6 @@ struct pb_protocol_message *pb_protocol_create_message(void *ctx,
 struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd);
 
 struct device *pb_protocol_deserialise_device(void *ctx,
 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);

 
 #endif /* _PB_PROTOCOL_H */
 
 #endif /* _PB_PROTOCOL_H */