From: Jeroen van der Heijden Date: Thu, 23 Jul 2020 10:21:22 +0000 (+0200) Subject: more gcc 10 warnings X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~4^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b068328e3e7cd6faa7e3beb947743fae1e30737c;p=siridb-server.git more gcc 10 warnings --- diff --git a/include/siri/db/listener.h b/include/siri/db/listener.h index 0950e7d4..eec69f5d 100644 --- a/include/siri/db/listener.h +++ b/include/siri/db/listener.h @@ -7,9 +7,19 @@ #include #include -uv_async_cb siridb_listen_enter[CLERI_END]; -uv_async_cb siridb_listen_exit[CLERI_END]; +static uv_async_cb SIRIDB_NODE_ENTER[CLERI_END]; +static uv_async_cb SIRIDB_NODE_EXIT[CLERI_END]; void siridb_init_listener(void); +static inline uv_async_cb siridb_node_get_enter(enum cleri_grammar_ids gid) +{ + return SIRIDB_NODE_ENTER[gid]; +} + +static inline uv_async_cb siridb_node_get_exit(enum cleri_grammar_ids gid) +{ + return SIRIDB_NODE_EXIT[gid]; +} + #endif /* SIRIDB_LISTENER_H_ */ diff --git a/include/siri/db/props.h b/include/siri/db/props.h index af845b00..1144579b 100644 --- a/include/siri/db/props.h +++ b/include/siri/db/props.h @@ -10,13 +10,28 @@ void siridb_init_props(void); +static char * WHO_AM_I = NULL; + typedef void (* siridb_props_cb)( siridb_t * siridb, qp_packer_t * packer, int flags); -siridb_props_cb siridb_props[KW_COUNT]; +static siridb_props_cb SIRIDB_PROPS[KW_COUNT]; + +static inline void props_set_who_am_i(char * s) +{ + WHO_AM_I = s; +} + +static inline char * props_get_who_am_i(void) +{ + return WHO_AM_I; +} -char * who_am_i; +static inline siridb_props_cb props_get_cb(int i) +{ + return SIRIDB_PROPS[i]; +} #endif /* SIRIDB_PROPS_H_ */ diff --git a/src/siri/db/listener.c b/src/siri/db/listener.c index 94b80ec5..9f9657a3 100644 --- a/src/siri/db/listener.c +++ b/src/siri/db/listener.c @@ -403,105 +403,105 @@ void siridb_init_listener(void) for (i = 0; i < CLERI_END; i++) { - siridb_listen_enter[i] = NULL; - siridb_listen_exit[i] = NULL; - } - - siridb_listen_enter[CLERI_GID_ACCESS_EXPR] = enter_access_expr; - siridb_listen_enter[CLERI_GID_ALTER_GROUP] = enter_alter_group; - siridb_listen_enter[CLERI_GID_ALTER_SERVER] = enter_alter_server; - siridb_listen_enter[CLERI_GID_ALTER_SERVERS] = enter_alter_servers; - siridb_listen_enter[CLERI_GID_ALTER_STMT] = enter_alter_stmt; - siridb_listen_enter[CLERI_GID_ALTER_USER] = enter_alter_user; - siridb_listen_enter[CLERI_GID_COUNT_STMT] = enter_count_stmt; - siridb_listen_enter[CLERI_GID_CREATE_STMT] = enter_create_stmt; - siridb_listen_enter[CLERI_GID_CREATE_USER] = enter_create_user; - siridb_listen_enter[CLERI_GID_DROP_STMT] = enter_drop_stmt; - siridb_listen_enter[CLERI_GID_GRANT_USER] = enter_grant_user; - siridb_listen_enter[CLERI_GID_GROUP_COLUMNS] = enter_xxx_columns; - siridb_listen_enter[CLERI_GID_GROUP_MATCH] = enter_group_match; - siridb_listen_enter[CLERI_GID_HELP_STMT] = enter_help; - siridb_listen_enter[CLERI_GID_LIMIT_EXPR] = enter_limit_expr; - siridb_listen_enter[CLERI_GID_LIST_STMT] = enter_list_stmt; - siridb_listen_enter[CLERI_GID_MERGE_AS] = enter_merge_as; - siridb_listen_enter[CLERI_GID_POOL_COLUMNS] = enter_xxx_columns; - siridb_listen_enter[CLERI_GID_REVOKE_USER] = enter_revoke_user; - siridb_listen_enter[CLERI_GID_SELECT_STMT] = enter_select_stmt; - siridb_listen_enter[CLERI_GID_SET_EXPRESSION] = enter_set_expression; - siridb_listen_enter[CLERI_GID_SET_IGNORE_THRESHOLD] = enter_set_ignore_threshold; - siridb_listen_enter[CLERI_GID_SET_NAME] = enter_set_name; - siridb_listen_enter[CLERI_GID_SET_PASSWORD] = enter_set_password; - siridb_listen_enter[CLERI_GID_SERIES_COLUMNS] = enter_xxx_columns; - siridb_listen_enter[CLERI_GID_SERVER_COLUMNS] = enter_xxx_columns; - siridb_listen_enter[CLERI_GID_SERIES_ALL] = enter_series_all; - siridb_listen_enter[CLERI_GID_SERIES_NAME] = enter_series_name; - siridb_listen_enter[CLERI_GID_SERIES_MATCH] = enter_series_match; - siridb_listen_enter[CLERI_GID_SERIES_PARENTHESES] = enter_series_parentheses; - siridb_listen_enter[CLERI_GID_SERIES_RE] = enter_series_re; - siridb_listen_enter[CLERI_GID_SERIES_SETOPR] = enter_series_setopr; - siridb_listen_enter[CLERI_GID_SHARD_COLUMNS] = enter_xxx_columns; - siridb_listen_enter[CLERI_GID_TIMEIT_STMT] = enter_timeit_stmt; - siridb_listen_enter[CLERI_GID_USER_COLUMNS] = enter_xxx_columns; - siridb_listen_enter[CLERI_GID_WHERE_GROUP] = enter_where_xxx; - siridb_listen_enter[CLERI_GID_WHERE_POOL] = enter_where_xxx; - siridb_listen_enter[CLERI_GID_WHERE_SERIES] = enter_where_xxx; - siridb_listen_enter[CLERI_GID_WHERE_SERVER] = enter_where_xxx; - siridb_listen_enter[CLERI_GID_WHERE_SHARD] = enter_where_xxx; - siridb_listen_enter[CLERI_GID_WHERE_USER] = enter_where_xxx; - - - siridb_listen_exit[CLERI_GID_AFTER_EXPR] = exit_after_expr; - siridb_listen_exit[CLERI_GID_ALTER_GROUP] = exit_alter_group; - siridb_listen_exit[CLERI_GID_ALTER_USER] = exit_alter_user; - siridb_listen_exit[CLERI_GID_BEFORE_EXPR] = exit_before_expr; - siridb_listen_exit[CLERI_GID_BETWEEN_EXPR] = exit_between_expr; - siridb_listen_exit[CLERI_GID_CALC_STMT] = exit_calc_stmt; - siridb_listen_exit[CLERI_GID_COUNT_GROUPS] = exit_count_groups; - siridb_listen_exit[CLERI_GID_COUNT_POOLS] = exit_count_pools; - siridb_listen_exit[CLERI_GID_COUNT_SERIES] = exit_count_series; - siridb_listen_exit[CLERI_GID_COUNT_SERIES_LENGTH] = exit_count_series_length; - siridb_listen_exit[CLERI_GID_COUNT_SERVERS] = exit_count_servers; - siridb_listen_exit[CLERI_GID_COUNT_SERVERS_RECEIVED] = exit_count_servers_received; - siridb_listen_exit[CLERI_GID_COUNT_SERVERS_SELECTED] = exit_count_servers_selected; - siridb_listen_exit[CLERI_GID_COUNT_SHARDS] = exit_count_shards; - siridb_listen_exit[CLERI_GID_COUNT_SHARDS_SIZE] = exit_count_shards_size; - siridb_listen_exit[CLERI_GID_COUNT_USERS] = exit_count_users; - siridb_listen_exit[CLERI_GID_CREATE_GROUP] = exit_create_group; - siridb_listen_exit[CLERI_GID_CREATE_USER] = exit_create_user; - siridb_listen_exit[CLERI_GID_DROP_GROUP] = exit_drop_group; - siridb_listen_exit[CLERI_GID_DROP_SERIES] = exit_drop_series; - siridb_listen_exit[CLERI_GID_DROP_SERVER] = exit_drop_server; - siridb_listen_exit[CLERI_GID_DROP_SHARDS] = exit_drop_shards; - siridb_listen_exit[CLERI_GID_DROP_USER] = exit_drop_user; - siridb_listen_exit[CLERI_GID_GRANT_USER] = exit_grant_user; - siridb_listen_exit[CLERI_GID_LIST_GROUPS] = exit_list_groups; - siridb_listen_exit[CLERI_GID_LIST_POOLS] = exit_list_pools; - siridb_listen_exit[CLERI_GID_LIST_SERIES] = exit_list_series; - siridb_listen_exit[CLERI_GID_LIST_SERVERS] = exit_list_servers; - siridb_listen_exit[CLERI_GID_LIST_SHARDS] = exit_list_shards; - siridb_listen_exit[CLERI_GID_LIST_USERS] = exit_list_users; - siridb_listen_exit[CLERI_GID_REVOKE_USER] = exit_revoke_user; - siridb_listen_exit[CLERI_GID_SELECT_AGGREGATE] = exit_select_aggregate; - siridb_listen_exit[CLERI_GID_SELECT_STMT] = exit_select_stmt; - siridb_listen_exit[CLERI_GID_SERIES_MATCH] = exit_series_match; - siridb_listen_exit[CLERI_GID_SERIES_PARENTHESES] = exit_series_parentheses; - siridb_listen_exit[CLERI_GID_SET_ADDRESS] = exit_set_address; - siridb_listen_exit[CLERI_GID_SET_BACKUP_MODE] = exit_set_backup_mode; - siridb_listen_exit[CLERI_GID_SET_DROP_THRESHOLD] = exit_set_drop_threshold; - siridb_listen_exit[CLERI_GID_SET_EXPIRATION_LOG] = exit_set_expiration_log; - siridb_listen_exit[CLERI_GID_SET_EXPIRATION_NUM] = exit_set_expiration_num; - siridb_listen_exit[CLERI_GID_SET_LIST_LIMIT] = exit_set_list_limit; - siridb_listen_exit[CLERI_GID_SET_LOG_LEVEL] = exit_set_log_level; - siridb_listen_exit[CLERI_GID_SET_PORT] = exit_set_port; - siridb_listen_exit[CLERI_GID_SET_SELECT_POINTS_LIMIT] = exit_set_select_points_limit; - siridb_listen_exit[CLERI_GID_SET_TEE_PIPE_NAME] = exit_set_tee_pipe_name; - siridb_listen_exit[CLERI_GID_SET_TIMEZONE] = exit_set_timezone; - siridb_listen_exit[CLERI_GID_SHOW_STMT] = exit_show_stmt; - siridb_listen_exit[CLERI_GID_TIMEIT_STMT] = exit_timeit_stmt; + SIRIDB_NODE_ENTER[i] = NULL; + SIRIDB_NODE_EXIT[i] = NULL; + } + + SIRIDB_NODE_ENTER[CLERI_GID_ACCESS_EXPR] = enter_access_expr; + SIRIDB_NODE_ENTER[CLERI_GID_ALTER_GROUP] = enter_alter_group; + SIRIDB_NODE_ENTER[CLERI_GID_ALTER_SERVER] = enter_alter_server; + SIRIDB_NODE_ENTER[CLERI_GID_ALTER_SERVERS] = enter_alter_servers; + SIRIDB_NODE_ENTER[CLERI_GID_ALTER_STMT] = enter_alter_stmt; + SIRIDB_NODE_ENTER[CLERI_GID_ALTER_USER] = enter_alter_user; + SIRIDB_NODE_ENTER[CLERI_GID_COUNT_STMT] = enter_count_stmt; + SIRIDB_NODE_ENTER[CLERI_GID_CREATE_STMT] = enter_create_stmt; + SIRIDB_NODE_ENTER[CLERI_GID_CREATE_USER] = enter_create_user; + SIRIDB_NODE_ENTER[CLERI_GID_DROP_STMT] = enter_drop_stmt; + SIRIDB_NODE_ENTER[CLERI_GID_GRANT_USER] = enter_grant_user; + SIRIDB_NODE_ENTER[CLERI_GID_GROUP_COLUMNS] = enter_xxx_columns; + SIRIDB_NODE_ENTER[CLERI_GID_GROUP_MATCH] = enter_group_match; + SIRIDB_NODE_ENTER[CLERI_GID_HELP_STMT] = enter_help; + SIRIDB_NODE_ENTER[CLERI_GID_LIMIT_EXPR] = enter_limit_expr; + SIRIDB_NODE_ENTER[CLERI_GID_LIST_STMT] = enter_list_stmt; + SIRIDB_NODE_ENTER[CLERI_GID_MERGE_AS] = enter_merge_as; + SIRIDB_NODE_ENTER[CLERI_GID_POOL_COLUMNS] = enter_xxx_columns; + SIRIDB_NODE_ENTER[CLERI_GID_REVOKE_USER] = enter_revoke_user; + SIRIDB_NODE_ENTER[CLERI_GID_SELECT_STMT] = enter_select_stmt; + SIRIDB_NODE_ENTER[CLERI_GID_SET_EXPRESSION] = enter_set_expression; + SIRIDB_NODE_ENTER[CLERI_GID_SET_IGNORE_THRESHOLD] = enter_set_ignore_threshold; + SIRIDB_NODE_ENTER[CLERI_GID_SET_NAME] = enter_set_name; + SIRIDB_NODE_ENTER[CLERI_GID_SET_PASSWORD] = enter_set_password; + SIRIDB_NODE_ENTER[CLERI_GID_SERIES_COLUMNS] = enter_xxx_columns; + SIRIDB_NODE_ENTER[CLERI_GID_SERVER_COLUMNS] = enter_xxx_columns; + SIRIDB_NODE_ENTER[CLERI_GID_SERIES_ALL] = enter_series_all; + SIRIDB_NODE_ENTER[CLERI_GID_SERIES_NAME] = enter_series_name; + SIRIDB_NODE_ENTER[CLERI_GID_SERIES_MATCH] = enter_series_match; + SIRIDB_NODE_ENTER[CLERI_GID_SERIES_PARENTHESES] = enter_series_parentheses; + SIRIDB_NODE_ENTER[CLERI_GID_SERIES_RE] = enter_series_re; + SIRIDB_NODE_ENTER[CLERI_GID_SERIES_SETOPR] = enter_series_setopr; + SIRIDB_NODE_ENTER[CLERI_GID_SHARD_COLUMNS] = enter_xxx_columns; + SIRIDB_NODE_ENTER[CLERI_GID_TIMEIT_STMT] = enter_timeit_stmt; + SIRIDB_NODE_ENTER[CLERI_GID_USER_COLUMNS] = enter_xxx_columns; + SIRIDB_NODE_ENTER[CLERI_GID_WHERE_GROUP] = enter_where_xxx; + SIRIDB_NODE_ENTER[CLERI_GID_WHERE_POOL] = enter_where_xxx; + SIRIDB_NODE_ENTER[CLERI_GID_WHERE_SERIES] = enter_where_xxx; + SIRIDB_NODE_ENTER[CLERI_GID_WHERE_SERVER] = enter_where_xxx; + SIRIDB_NODE_ENTER[CLERI_GID_WHERE_SHARD] = enter_where_xxx; + SIRIDB_NODE_ENTER[CLERI_GID_WHERE_USER] = enter_where_xxx; + + + SIRIDB_NODE_EXIT[CLERI_GID_AFTER_EXPR] = exit_after_expr; + SIRIDB_NODE_EXIT[CLERI_GID_ALTER_GROUP] = exit_alter_group; + SIRIDB_NODE_EXIT[CLERI_GID_ALTER_USER] = exit_alter_user; + SIRIDB_NODE_EXIT[CLERI_GID_BEFORE_EXPR] = exit_before_expr; + SIRIDB_NODE_EXIT[CLERI_GID_BETWEEN_EXPR] = exit_between_expr; + SIRIDB_NODE_EXIT[CLERI_GID_CALC_STMT] = exit_calc_stmt; + SIRIDB_NODE_EXIT[CLERI_GID_COUNT_GROUPS] = exit_count_groups; + SIRIDB_NODE_EXIT[CLERI_GID_COUNT_POOLS] = exit_count_pools; + SIRIDB_NODE_EXIT[CLERI_GID_COUNT_SERIES] = exit_count_series; + SIRIDB_NODE_EXIT[CLERI_GID_COUNT_SERIES_LENGTH] = exit_count_series_length; + SIRIDB_NODE_EXIT[CLERI_GID_COUNT_SERVERS] = exit_count_servers; + SIRIDB_NODE_EXIT[CLERI_GID_COUNT_SERVERS_RECEIVED] = exit_count_servers_received; + SIRIDB_NODE_EXIT[CLERI_GID_COUNT_SERVERS_SELECTED] = exit_count_servers_selected; + SIRIDB_NODE_EXIT[CLERI_GID_COUNT_SHARDS] = exit_count_shards; + SIRIDB_NODE_EXIT[CLERI_GID_COUNT_SHARDS_SIZE] = exit_count_shards_size; + SIRIDB_NODE_EXIT[CLERI_GID_COUNT_USERS] = exit_count_users; + SIRIDB_NODE_EXIT[CLERI_GID_CREATE_GROUP] = exit_create_group; + SIRIDB_NODE_EXIT[CLERI_GID_CREATE_USER] = exit_create_user; + SIRIDB_NODE_EXIT[CLERI_GID_DROP_GROUP] = exit_drop_group; + SIRIDB_NODE_EXIT[CLERI_GID_DROP_SERIES] = exit_drop_series; + SIRIDB_NODE_EXIT[CLERI_GID_DROP_SERVER] = exit_drop_server; + SIRIDB_NODE_EXIT[CLERI_GID_DROP_SHARDS] = exit_drop_shards; + SIRIDB_NODE_EXIT[CLERI_GID_DROP_USER] = exit_drop_user; + SIRIDB_NODE_EXIT[CLERI_GID_GRANT_USER] = exit_grant_user; + SIRIDB_NODE_EXIT[CLERI_GID_LIST_GROUPS] = exit_list_groups; + SIRIDB_NODE_EXIT[CLERI_GID_LIST_POOLS] = exit_list_pools; + SIRIDB_NODE_EXIT[CLERI_GID_LIST_SERIES] = exit_list_series; + SIRIDB_NODE_EXIT[CLERI_GID_LIST_SERVERS] = exit_list_servers; + SIRIDB_NODE_EXIT[CLERI_GID_LIST_SHARDS] = exit_list_shards; + SIRIDB_NODE_EXIT[CLERI_GID_LIST_USERS] = exit_list_users; + SIRIDB_NODE_EXIT[CLERI_GID_REVOKE_USER] = exit_revoke_user; + SIRIDB_NODE_EXIT[CLERI_GID_SELECT_AGGREGATE] = exit_select_aggregate; + SIRIDB_NODE_EXIT[CLERI_GID_SELECT_STMT] = exit_select_stmt; + SIRIDB_NODE_EXIT[CLERI_GID_SERIES_MATCH] = exit_series_match; + SIRIDB_NODE_EXIT[CLERI_GID_SERIES_PARENTHESES] = exit_series_parentheses; + SIRIDB_NODE_EXIT[CLERI_GID_SET_ADDRESS] = exit_set_address; + SIRIDB_NODE_EXIT[CLERI_GID_SET_BACKUP_MODE] = exit_set_backup_mode; + SIRIDB_NODE_EXIT[CLERI_GID_SET_DROP_THRESHOLD] = exit_set_drop_threshold; + SIRIDB_NODE_EXIT[CLERI_GID_SET_EXPIRATION_LOG] = exit_set_expiration_log; + SIRIDB_NODE_EXIT[CLERI_GID_SET_EXPIRATION_NUM] = exit_set_expiration_num; + SIRIDB_NODE_EXIT[CLERI_GID_SET_LIST_LIMIT] = exit_set_list_limit; + SIRIDB_NODE_EXIT[CLERI_GID_SET_LOG_LEVEL] = exit_set_log_level; + SIRIDB_NODE_EXIT[CLERI_GID_SET_PORT] = exit_set_port; + SIRIDB_NODE_EXIT[CLERI_GID_SET_SELECT_POINTS_LIMIT] = exit_set_select_points_limit; + SIRIDB_NODE_EXIT[CLERI_GID_SET_TEE_PIPE_NAME] = exit_set_tee_pipe_name; + SIRIDB_NODE_EXIT[CLERI_GID_SET_TIMEZONE] = exit_set_timezone; + SIRIDB_NODE_EXIT[CLERI_GID_SHOW_STMT] = exit_show_stmt; + SIRIDB_NODE_EXIT[CLERI_GID_TIMEIT_STMT] = exit_timeit_stmt; for (i = HELP_OFFSET; i < HELP_OFFSET + HELP_COUNT; i++) { - siridb_listen_exit[i] = exit_help_xxx; + SIRIDB_NODE_EXIT[i] = exit_help_xxx; } } @@ -4449,7 +4449,7 @@ static void exit_show_stmt(uv_async_t * handle) qp_add_type(query->packer, QP_ARRAY_OPEN); /* set props.h (who_am_i) to current db_name */ - who_am_i = db_user->name; + props_set_who_am_i(db_user->name); if (children == NULL || children->node == NULL) { @@ -4458,7 +4458,7 @@ static void exit_show_stmt(uv_async_t * handle) for (i = 0; i < KW_COUNT; i++) { - if ((prop_cb = siridb_props[i]) == NULL) + if ((prop_cb = props_get_cb(i)) == NULL) { continue; } @@ -4471,8 +4471,8 @@ static void exit_show_stmt(uv_async_t * handle) while (1) { /* get the callback */ - prop_cb = siridb_props[children->node->children->node-> - cl_obj->gid - KW_OFFSET]; + prop_cb = props_get_cb(children->node->children->node-> + cl_obj->gid - KW_OFFSET); assert (prop_cb != NULL); /* all props are implemented */ prop_cb(siridb, query->packer, 1); diff --git a/src/siri/db/props.c b/src/siri/db/props.c index 2e57bb22..0706131e 100644 --- a/src/siri/db/props.c +++ b/src/siri/db/props.c @@ -177,90 +177,88 @@ static void prop_who_am_i( qp_packer_t * packer, int map); -extern char * who_am_i; - void siridb_init_props(void) { uint_fast16_t i; for (i = 0; i < KW_COUNT; i++) { - siridb_props[i] = NULL; + SIRIDB_PROPS[i] = NULL; } - siridb_props[CLERI_GID_K_ACTIVE_HANDLES - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_ACTIVE_HANDLES - KW_OFFSET] = prop_active_handles; - siridb_props[CLERI_GID_K_ACTIVE_TASKS - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_ACTIVE_TASKS - KW_OFFSET] = prop_active_tasks; - siridb_props[CLERI_GID_K_BUFFER_PATH - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_BUFFER_PATH - KW_OFFSET] = prop_buffer_path; - siridb_props[CLERI_GID_K_BUFFER_SIZE - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_BUFFER_SIZE - KW_OFFSET] = prop_buffer_size; - siridb_props[CLERI_GID_K_DBNAME - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_DBNAME - KW_OFFSET] = prop_dbname; - siridb_props[CLERI_GID_K_DBPATH - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_DBPATH - KW_OFFSET] = prop_dbpath; - siridb_props[CLERI_GID_K_DROP_THRESHOLD - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_DROP_THRESHOLD - KW_OFFSET] = prop_drop_threshold; - siridb_props[CLERI_GID_K_DURATION_LOG - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_DURATION_LOG - KW_OFFSET] = prop_duration_log; - siridb_props[CLERI_GID_K_DURATION_NUM - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_DURATION_NUM - KW_OFFSET] = prop_duration_num; - siridb_props[CLERI_GID_K_FIFO_FILES - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_FIFO_FILES - KW_OFFSET] = prop_fifo_files; - siridb_props[CLERI_GID_K_EXPIRATION_LOG - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_EXPIRATION_LOG - KW_OFFSET] = prop_expiration_log; - siridb_props[CLERI_GID_K_EXPIRATION_NUM - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_EXPIRATION_NUM - KW_OFFSET] = prop_expiration_num; - siridb_props[CLERI_GID_K_IDLE_PERCENTAGE - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_IDLE_PERCENTAGE - KW_OFFSET] = prop_idle_percentage; - siridb_props[CLERI_GID_K_IDLE_TIME - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_IDLE_TIME - KW_OFFSET] = prop_idle_time; - siridb_props[CLERI_GID_K_IP_SUPPORT - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_IP_SUPPORT - KW_OFFSET] = prop_ip_support; - siridb_props[CLERI_GID_K_LIBUV - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_LIBUV - KW_OFFSET] = prop_libuv; - siridb_props[CLERI_GID_K_LIST_LIMIT - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_LIST_LIMIT - KW_OFFSET] = prop_list_limit; - siridb_props[CLERI_GID_K_MAX_OPEN_FILES - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_MAX_OPEN_FILES - KW_OFFSET] = prop_max_open_files; - siridb_props[CLERI_GID_K_MEM_USAGE - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_MEM_USAGE - KW_OFFSET] = prop_mem_usage; - siridb_props[CLERI_GID_K_LOG_LEVEL - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_LOG_LEVEL - KW_OFFSET] = prop_log_level; - siridb_props[CLERI_GID_K_OPEN_FILES - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_OPEN_FILES - KW_OFFSET] = prop_open_files; - siridb_props[CLERI_GID_K_POOL - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_POOL - KW_OFFSET] = prop_pool; - siridb_props[CLERI_GID_K_RECEIVED_POINTS - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_RECEIVED_POINTS - KW_OFFSET] = prop_received_points; - siridb_props[CLERI_GID_K_REINDEX_PROGRESS - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_REINDEX_PROGRESS - KW_OFFSET] = prop_reindex_progress; - siridb_props[CLERI_GID_K_SELECTED_POINTS - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_SELECTED_POINTS - KW_OFFSET] = prop_selected_points; - siridb_props[CLERI_GID_K_SELECT_POINTS_LIMIT - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_SELECT_POINTS_LIMIT - KW_OFFSET] = prop_select_points_limit; - siridb_props[CLERI_GID_K_SERVER - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_SERVER - KW_OFFSET] = prop_server; - siridb_props[CLERI_GID_K_STARTUP_TIME - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_STARTUP_TIME - KW_OFFSET] = prop_startup_time; - siridb_props[CLERI_GID_K_STATUS - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_STATUS - KW_OFFSET] = prop_status; - siridb_props[CLERI_GID_K_SYNC_PROGRESS - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_SYNC_PROGRESS - KW_OFFSET] = prop_sync_progress; - siridb_props[CLERI_GID_K_TEE_PIPE_NAME - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_TEE_PIPE_NAME - KW_OFFSET] = prop_tee_pipe_name; - siridb_props[CLERI_GID_K_TIMEZONE - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_TIMEZONE - KW_OFFSET] = prop_timezone; - siridb_props[CLERI_GID_K_TIME_PRECISION - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_TIME_PRECISION - KW_OFFSET] = prop_time_precision; - siridb_props[CLERI_GID_K_UPTIME - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_UPTIME - KW_OFFSET] = prop_uptime; - siridb_props[CLERI_GID_K_UUID - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_UUID - KW_OFFSET] = prop_uuid; - siridb_props[CLERI_GID_K_VERSION - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_VERSION - KW_OFFSET] = prop_version; - siridb_props[CLERI_GID_K_WHO_AM_I - KW_OFFSET] = + SIRIDB_PROPS[CLERI_GID_K_WHO_AM_I - KW_OFFSET] = prop_who_am_i; } @@ -616,5 +614,5 @@ static void prop_who_am_i( int map) { SIRIDB_PROP_MAP("who_am_i", 8) - qp_add_string(packer, who_am_i); + qp_add_string(packer, props_get_who_am_i()); } diff --git a/src/siri/db/query.c b/src/siri/db/query.c index 779b20fd..64aaf60c 100644 --- a/src/siri/db/query.c +++ b/src/siri/db/query.c @@ -692,12 +692,12 @@ static int QUERY_walk(cleri_node_t * node, siridb_walker_t * walker) */ if (gid != CLERI_NONE) { - if ( (func = siridb_listen_enter[gid]) != NULL && + if ( (func = siridb_node_get_enter(gid)) != NULL && siridb_walker_append(walker, node, func)) { return EXPR_MEM_ALLOC_ERR; } - if ( (func = siridb_listen_exit[gid]) != NULL && + if ( (func = siridb_node_get_exit(gid)) != NULL && siridb_walker_insert(walker, node, func)) { return EXPR_MEM_ALLOC_ERR;