summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2018-08-02 17:29:37 +0000
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2018-08-07 11:30:36 +1000
commit3696c3db457c4f5456fd357700085caa1056a0f0 (patch)
tree47b278f3bbc249a0594dfc30398f0d5f7eb587a2
parent0e8f8a64666558ed53bf25788bcce2167ff97890 (diff)
downloadtalos-petitboot-3696c3db457c4f5456fd357700085caa1056a0f0.tar.gz
talos-petitboot-3696c3db457c4f5456fd357700085caa1056a0f0.zip
discover/event: Rename param -> event_param
To avoid name clash with other 'struct param'. Signed-off-by: Geoff Levand <geoff@infradead.org> Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
-rw-r--r--discover/event.c8
-rw-r--r--discover/event.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/discover/event.c b/discover/event.c
index ead2fda..ec5537a 100644
--- a/discover/event.c
+++ b/discover/event.c
@@ -80,7 +80,7 @@ static int event_parse_ad_header(char *buf, int len, enum event_action *action,
static void event_parse_params(struct event *event, const char *buf, int len)
{
int param_len, name_len, value_len;
- struct param *param;
+ struct event_param *param;
char *sep;
for (; len > 0; len -= param_len + 1, buf += param_len + 1) {
@@ -95,7 +95,7 @@ static void event_parse_params(struct event *event, const char *buf, int len)
/* update the params array */
event->params = talloc_realloc(event, event->params,
- struct param, ++event->n_params);
+ struct event_param, ++event->n_params);
param = &event->params[event->n_params - 1];
sep = memchr(buf, '=', param_len);
@@ -150,7 +150,7 @@ const char *event_get_param(const struct event *event, const char *name)
void event_set_param(struct event *event, const char *name, const char *value)
{
- struct param *param;
+ struct event_param *param;
int i;
/* if it's already present, replace the value of the old param */
@@ -165,7 +165,7 @@ void event_set_param(struct event *event, const char *name, const char *value)
/* not found - create a new param */
event->params = talloc_realloc(event, event->params,
- struct param, ++event->n_params);
+ struct event_param, ++event->n_params);
param = &event->params[event->n_params - 1];
param->name = talloc_strdup(event, name);
diff --git a/discover/event.h b/discover/event.h
index 1f6966c..2d83ad9 100644
--- a/discover/event.h
+++ b/discover/event.h
@@ -23,7 +23,7 @@ struct event {
enum event_action action;
const char *device;
- struct param {
+ struct event_param {
char *name;
char *value;
} *params;
OpenPOWER on IntegriCloud