summaryrefslogtreecommitdiffstats
path: root/lib/pb-protocol
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2009-01-21 16:27:02 -0800
committerJeremy Kerr <jk@ozlabs.org>2009-02-01 11:54:30 +1100
commit58821e4d5e593e4a828a1d79215e9480e9a6ca4f (patch)
treefdad84542631071dd5e5ee20de48d818a27a8367 /lib/pb-protocol
parent2b42cdd35ccd83c52e9df257efdfcda040d170d9 (diff)
downloadpetitboot-58821e4d5e593e4a828a1d79215e9480e9a6ca4f.zip
petitboot-58821e4d5e593e4a828a1d79215e9480e9a6ca4f.tar.gz
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>
Diffstat (limited to 'lib/pb-protocol')
-rw-r--r--lib/pb-protocol/pb-protocol.c16
-rw-r--r--lib/pb-protocol/pb-protocol.h8
2 files changed, 13 insertions, 11 deletions
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 */
OpenPOWER on IntegriCloud