fix initializer for new compiler

tmpl_escape_t has multiple fields, so you can't initialize just one
via foo.bar.baz = {}.  Instead, you have to explicitly initialize the
entire struct, via foo.bar = { .bar = {} }

diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c
index bb8812de6a08b21c3f36340f06243f0e984b919d..f6ca556e9504f32f1a93efd70653a08cb91cb199 100644 (file)
--- a/src/modules/rlm_linelog/rlm_linelog.c
+++ b/src/modules/rlm_linelog/rlm_linelog.c
@@ -222,9 +222,9 @@ typedef struct {
 static const call_env_method_t linelog_method_env = {
        FR_CALL_ENV_METHOD_OUT(linelog_call_env_t),
        .env = (call_env_parser_t[]) {
-               { FR_CALL_ENV_PARSE_ONLY_OFFSET("format", FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT | CALL_ENV_FLAG_PARSE_ONLY| CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, linelog_call_env_t, log_src), .pair.escape.box_escape = LINELOG_BOX_ESCAPE },
-               { FR_CALL_ENV_OFFSET("reference",FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT | CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, linelog_call_env_t, log_ref), .pair.escape.box_escape = LINELOG_BOX_ESCAPE},
-               { FR_CALL_ENV_OFFSET("header", FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT, linelog_call_env_t, log_head), .pair.escape.box_escape = LINELOG_BOX_ESCAPE },
+               { FR_CALL_ENV_PARSE_ONLY_OFFSET("format", FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT | CALL_ENV_FLAG_PARSE_ONLY| CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, linelog_call_env_t, log_src), .pair.escape = { .box_escape = LINELOG_BOX_ESCAPE } },
+               { FR_CALL_ENV_OFFSET("reference",FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT | CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, linelog_call_env_t, log_ref), .pair.escape = { .box_escape = LINELOG_BOX_ESCAPE } },
+               { FR_CALL_ENV_OFFSET("header", FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT, linelog_call_env_t, log_head), .pair.escape = { .box_escape = LINELOG_BOX_ESCAPE } },
                { FR_CALL_ENV_SUBSECTION("file", NULL, CALL_ENV_FLAG_NONE,
                        ((call_env_parser_t[]) {
                                { FR_CALL_ENV_OFFSET("filename", FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT, linelog_call_env_t, filename),
@@ -238,7 +238,7 @@ static const call_env_method_t linelog_method_env = {
 static const call_env_method_t linelog_xlat_method_env = {
        FR_CALL_ENV_METHOD_OUT(linelog_call_env_t),
        .env = (call_env_parser_t[]) {
-               { FR_CALL_ENV_OFFSET("header", FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT, linelog_call_env_t, log_head), .pair.escape.box_escape = LINELOG_BOX_ESCAPE },
+               { FR_CALL_ENV_OFFSET("header", FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT, linelog_call_env_t, log_head), .pair.escape = { .box_escape = LINELOG_BOX_ESCAPE } },
                { FR_CALL_ENV_SUBSECTION("file", NULL, CALL_ENV_FLAG_NONE,
                        ((call_env_parser_t[]) {
                                { FR_CALL_ENV_OFFSET("filename", FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT, linelog_call_env_t, filename),

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 549aa75c05bd8cb001c2c4ce2d18731b55d6a2f9..158880d61a7fb7472ae7f1fbc6f2e498664c5e9d 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -2397,29 +2397,29 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
  */
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-       rlm_sql_thread_t        *t = talloc_get_type_abort(mctx->thread, rlm_sql_thread_t);
+       rlm_sql_thread_t        *thread = talloc_get_type_abort(mctx->thread, rlm_sql_thread_t);
        rlm_sql_t               *inst = talloc_get_type_abort(mctx->mi->data, rlm_sql_t);
 
        if (inst->driver->sql_escape_arg_alloc) {
-               t->sql_escape_arg = inst->driver->sql_escape_arg_alloc(t, mctx->el, inst);
-               if (!t->sql_escape_arg) return -1;
+               thread->sql_escape_arg = inst->driver->sql_escape_arg_alloc(thread, mctx->el, inst);
+               if (!thread->sql_escape_arg) return -1;
        }
 
-       t->inst = inst;
+       thread->inst = inst;
 
-       t->trunk = trunk_alloc(t, mctx->el, &inst->driver->trunk_io_funcs,
-                              &inst->config.trunk_conf, inst->name, t, false, inst->trigger_args);
-       if (!t->trunk) return -1;
+       thread->trunk = trunk_alloc(thread, mctx->el, &inst->driver->trunk_io_funcs,
+                              &inst->config.trunk_conf, inst->name, thread, false, inst->trigger_args);
+       if (!thread->trunk) return -1;
 
        return 0;
 }
 
 static int mod_thread_detach(module_thread_inst_ctx_t const *mctx)
 {
-       rlm_sql_thread_t        *t = talloc_get_type_abort(mctx->thread, rlm_sql_thread_t);
+       rlm_sql_thread_t        *thread = talloc_get_type_abort(mctx->thread, rlm_sql_thread_t);
        rlm_sql_t               *inst = talloc_get_type_abort(mctx->mi->data, rlm_sql_t);
 
-       if (inst->driver->sql_escape_arg_free) inst->driver->sql_escape_arg_free(t->sql_escape_arg);
+       if (inst->driver->sql_escape_arg_free) inst->driver->sql_escape_arg_free(thread->sql_escape_arg);
 
        return 0;
 }