From 58821e4d5e593e4a828a1d79215e9480e9a6ca4f Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 21 Jan 2009 16:27:02 -0800 Subject: [PATCH] Make device instance constant Make the instance of devices read-only. Signed-off-by: Geoff Levand Signed-off-by: Jeremy Kerr --- discover/device-handler.c | 2 +- discover/device-handler.h | 2 +- discover/discover-server.c | 4 ++-- lib/pb-protocol/pb-protocol.c | 16 +++++++++------- lib/pb-protocol/pb-protocol.h | 8 ++++---- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/discover/device-handler.c b/discover/device-handler.c index 9e40fb1..8a4930e 100644 --- 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)), - struct device **devices) + const struct device **devices) { *devices = &device; diff --git a/discover/device-handler.h b/discover/device-handler.h index cd28420..01179f2 100644 --- 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, - struct device **devices); + const struct device **devices); 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 56a427b..e03a44a 100644 --- 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, - struct client *client, struct device *dev) + struct client *client, const struct device *dev) { 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; - struct device *devices; + const struct device *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 0252b9a..4daeb5a 100644 --- 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 */ -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 +114,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 +136,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 +160,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 +279,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; diff --git a/lib/pb-protocol/pb-protocol.h b/lib/pb-protocol/pb-protocol.h index c8ce36b..36dbf00 100644 --- 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); -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, - 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); @@ -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 *message); + const struct pb_protocol_message *message); #endif /* _PB_PROTOCOL_H */ -- 2.39.2