diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2019-10-13 04:59:57 -0400 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2020-02-24 11:15:32 -0500 |
| commit | 601c572c3924be5e69a122bce81a9b57a7f985ae (patch) | |
| tree | 554cd4465d74aa3163848d714930568c46721937 /src/plugin.c | |
| parent | b7942c58cc6c028754340c9f8ded0f6cd1b43363 (diff) | |
| download | lighttpd-git-601c572c3924be5e69a122bce81a9b57a7f985ae.tar.gz | |
[core] inline buffer as part of data_string value
(instead of value being (buffer *))
Diffstat (limited to 'src/plugin.c')
| -rw-r--r-- | src/plugin.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugin.c b/src/plugin.c index 26a8cf45..ab02827c 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -139,13 +139,13 @@ int plugins_load(server *srv) { size_t i, j; for (i = 0; i < srv->srvconf.modules->used; i++) { - data_string *d = (data_string *)srv->srvconf.modules->data[i]; - char *module = d->value->ptr; + data_string *ds = (data_string *)srv->srvconf.modules->data[i]; + char *module = ds->value.ptr; for (j = 0; j < i; j++) { - if (buffer_is_equal(d->value, ((data_string *) srv->srvconf.modules->data[j])->value)) { + if (buffer_is_equal(&ds->value, &((data_string *) srv->srvconf.modules->data[j])->value)) { log_error_write(srv, __FILE__, __LINE__, "sbs", - "Cannot load plugin", d->value, + "Cannot load plugin", &ds->value, "more than once, please fix your config (lighttpd may not accept such configs in future releases)"); continue; } @@ -178,13 +178,13 @@ int plugins_load(server *srv) { size_t i, j; for (i = 0; i < srv->srvconf.modules->used; i++) { - data_string *d = (data_string *)srv->srvconf.modules->data[i]; - char *module = d->value->ptr; + data_string *ds = (data_string *)srv->srvconf.modules->data[i]; + char *module = ds->value.ptr; for (j = 0; j < i; j++) { - if (buffer_is_equal(d->value, ((data_string *) srv->srvconf.modules->data[j])->value)) { + if (buffer_is_equal(&ds->value, &((data_string *) srv->srvconf.modules->data[j])->value)) { log_error_write(srv, __FILE__, __LINE__, "sbs", - "Cannot load plugin", d->value, + "Cannot load plugin", &ds->value, "more than once, please fix your config (lighttpd may not accept such configs in future releases)"); continue; } |