From 9d2542d062da9e1e3934f504b4d769998a76c991 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 22 May 2017 05:05:34 -0600 Subject: [PATCH] bootstage: Adjust to use const * where possible There are a few places that should use const *, such as bootstage_unstash(). Update these to make it clearer when parameters are changed. Signed-off-by: Simon Glass --- common/bootstage.c | 12 ++++++------ include/bootstage.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/bootstage.c b/common/bootstage.c index 9ef931f..61479d7 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -205,7 +205,7 @@ uint32_t bootstage_accum(enum bootstage_id id) * @return pointer to name, either from the record or pointing to buf. */ static const char *get_record_name(char *buf, int len, - struct bootstage_record *rec) + const struct bootstage_record *rec) { if (rec->name) return rec->name; @@ -361,9 +361,9 @@ static void append_data(char **ptrp, char *end, const void *data, int size) int bootstage_stash(void *base, int size) { - struct bootstage_data *data = gd->bootstage; + const struct bootstage_data *data = gd->bootstage; struct bootstage_hdr *hdr = (struct bootstage_hdr *)base; - struct bootstage_record *rec; + const struct bootstage_record *rec; char buf[20]; char *ptr = base, *end = ptr + size; uint32_t count; @@ -414,12 +414,12 @@ int bootstage_stash(void *base, int size) return 0; } -int bootstage_unstash(void *base, int size) +int bootstage_unstash(const void *base, int size) { + const struct bootstage_hdr *hdr = (struct bootstage_hdr *)base; struct bootstage_data *data = gd->bootstage; - struct bootstage_hdr *hdr = (struct bootstage_hdr *)base; + const char *ptr = base, *end = ptr + size; struct bootstage_record *rec; - char *ptr = base, *end = ptr + size; uint rec_size; int i; diff --git a/include/bootstage.h b/include/bootstage.h index 848769b..5f4fffa 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -333,7 +333,7 @@ int bootstage_stash(void *base, int size); * there is not space for read the stacked data, or other error if * something else went wrong */ -int bootstage_unstash(void *base, int size); +int bootstage_unstash(const void *base, int size); /** * bootstage_get_size() - Get the size of the bootstage data @@ -406,7 +406,7 @@ static inline int bootstage_stash(void *base, int size) return 0; /* Pretend to succeed */ } -static inline int bootstage_unstash(void *base, int size) +static inline int bootstage_unstash(const void *base, int size) { return 0; /* Pretend to succeed */ }