From 3ad426f88d274535d7e04e12add72534034ac075 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Mon, 20 May 2019 16:09:13 +0300 Subject: Upgrade grecs --- grecs | 2 +- ident/provider.c | 2 +- lib/pp.c | 1 + src/ctl.c | 2 +- src/pies.c | 4 ++-- src/piesctl.c | 2 +- src/sysvinit.c | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/grecs b/grecs index 1c1e7a9..1fa2dd2 160000 --- a/grecs +++ b/grecs @@ -1 +1 @@ -Subproject commit 1c1e7a987f643aae50bf8b45928650bb384e5c6d +Subproject commit 1fa2dd2c6587822ff682581643499c3c3b78c9ea diff --git a/ident/provider.c b/ident/provider.c index 44ae342..b212cca 100644 --- a/ident/provider.c +++ b/ident/provider.c @@ -77,7 +77,7 @@ idmech_help (void *data, void *unused) void pies_config_identity_mechanisms_help () { - grecs_symtab_enumerate (idmech_symtab, idmech_help, NULL); + grecs_symtab_foreach (idmech_symtab, idmech_help, NULL); } static int diff --git a/lib/pp.c b/lib/pp.c index 8a9471a..2ec6d99 100644 --- a/lib/pp.c +++ b/lib/pp.c @@ -15,6 +15,7 @@ along with GNU Pies. If not, see . */ #include +#include #include #include diff --git a/src/ctl.c b/src/ctl.c index c0e8c10..475fda6 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -711,7 +711,7 @@ ctlio_finalize_reply (struct ctlio *io) ctlio_printf (io, "HTTP/1.1 %3d %s", io->code, http_text (io->code)); ctlio_eol (io); - grecs_symtab_enumerate (io->output.headers, format_header, io); + grecs_symtab_foreach (io->output.headers, format_header, io); ctlio_eol (io); ctlbuf_copy (&io->obuf, &tmpbuf); diff --git a/src/pies.c b/src/pies.c index 503be73..cf26050 100644 --- a/src/pies.c +++ b/src/pies.c @@ -539,7 +539,7 @@ _cb_command (enum grecs_callback_command cmd, grecs_error (locus, 0, "wordsplit: %s", strerror (errno)); return 1; } - wordsplit_getwords (&ws, &comp->argc, &comp->argv); + wordsplit_get_words (&ws, &comp->argc, &comp->argv); wordsplit_free (&ws); break; @@ -594,7 +594,7 @@ _cb_env (enum grecs_callback_command cmd, grecs_error (locus, 0, "wordsplit: %s", strerror (errno)); return 1; } - wordsplit_getwords (&ws, &argc, &argv); + wordsplit_get_words (&ws, &argc, &argv); wordsplit_free (&ws); break; diff --git a/src/piesctl.c b/src/piesctl.c index 27be361..44bd263 100644 --- a/src/piesctl.c +++ b/src/piesctl.c @@ -656,7 +656,7 @@ shttp_request_send (struct shttp_connection *conn, int method, char const *uri) if (conn->b64auth) shttp_send_line (conn, "Authorization: Basic %s", conn->b64auth); - grecs_symtab_enumerate (conn->req.headers, send_header, conn); + grecs_symtab_foreach (conn->req.headers, send_header, conn); if (conn->req.content_length) { shttp_send_line (conn, "Content-Length: %lu", conn->req.content_length); diff --git a/src/sysvinit.c b/src/sysvinit.c index c05a040..a33fab7 100644 --- a/src/sysvinit.c +++ b/src/sysvinit.c @@ -1131,7 +1131,7 @@ inittab_parse_line (struct inittab_ctx *ctx) strerror (errno)); return inittab_err; } - wordsplit_getwords (&ws, &comp->argc, &comp->argv); + wordsplit_get_words (&ws, &comp->argc, &comp->argv); comp->program = grecs_strdup (comp->argv[0]); wordsplit_free (&ws); -- cgit v1.2.1