Skip to content

Commit

Permalink
Use C99 field labels when initialising driver structs
Browse files Browse the repository at this point in the history 
Means it's possible to add new callback functions in the module structs without having to go through and add NULL field initialisers to every module
  • Loading branch information
@arr2036
arr2036 committed Nov 15, 2014
1 parent 39150e3 commit 6973488
Show file tree
Hide file tree
Showing 11 changed files with 134 additions and 140 deletions.
25 changes: 11 additions & 14 deletions src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
View file
Expand Up @@ -315,18 +315,15 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *

/* Exported to rlm_sql */
rlm_sql_module_t rlm_sql_db2 = {
"rlm_sql_db2",
NULL,
sql_socket_init,
sql_query,
sql_select_query,
NULL, /* sql_store_result */
sql_num_fields,
NULL, /* sql_num_rows */
sql_fetch_row,
sql_free_result,
sql_error,
sql_finish_query,
sql_finish_select_query,
sql_affected_rows,
.name = "rlm_sql_db2",
.sql_socket_init = sql_socket_init,
.sql_query = sql_query,
.sql_select_query = sql_select_query,
.sql_num_fields = sql_num_fields,
.sql_fetch_row = sql_fetch_row,
.sql_free_result = sql_free_result,
.sql_error = sql_error,
.sql_finish_query = sql_finish_query,
.sql_finish_select_query = sql_finish_select_query,
.sql_affected_rows = sql_affected_rows
};
27 changes: 13 additions & 14 deletions src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
View file
Expand Up @@ -278,18 +278,17 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, rlm_sql_config_t *config)

/* Exported to rlm_sql */
rlm_sql_module_t rlm_sql_firebird = {
"rlm_sql_firebird",
NULL,
sql_socket_init,
sql_query,
sql_select_query,
sql_store_result,
sql_num_fields,
sql_num_rows,
sql_fetch_row,
sql_free_result,
sql_error,
sql_finish_query,
sql_finish_select_query,
sql_affected_rows
.name = "rlm_sql_firebird",
.sql_socket_init = sql_socket_init,
.sql_query = sql_query,
.sql_select_query = sql_select_query,
.sql_store_result = sql_store_result,
.sql_num_fields = sql_num_fields,
.sql_num_rows = sql_num_rows,
.sql_fetch_row = sql_fetch_row,
.sql_free_result = sql_free_result,
.sql_error = sql_error,
.sql_finish_query = sql_finish_query,
.sql_finish_select_query = sql_finish_select_query,
.sql_affected_rows = sql_affected_rows
};
27 changes: 13 additions & 14 deletions src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
View file
Expand Up @@ -822,18 +822,17 @@ static sql_rcode_t sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *c

/* Exported to rlm_sql */
rlm_sql_module_t rlm_sql_freetds = {
"rlm_sql_freetds",
NULL,
sql_socket_init,
sql_query,
sql_select_query,
sql_store_result,
sql_num_fields,
sql_num_rows,
sql_fetch_row,
sql_free_result,
sql_error,
sql_finish_query,
sql_finish_select_query,
sql_affected_rows
.name = "rlm_sql_freetds",
.sql_socket_init = sql_socket_init,
.sql_query = sql_query,
.sql_select_query = sql_select_query,
.sql_store_result = sql_store_result,
.sql_num_fields = sql_num_fields,
.sql_num_rows = sql_num_rows,
.sql_fetch_row = sql_fetch_row,
.sql_free_result = sql_free_result,
.sql_error = sql_error,
.sql_finish_query = sql_finish_query,
.sql_finish_select_query = sql_finish_select_query,
.sql_affected_rows = sql_affected_rows
};
27 changes: 13 additions & 14 deletions src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
View file
Expand Up @@ -384,18 +384,17 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *

/* Exported to rlm_sql */
rlm_sql_module_t rlm_sql_iodbc = {
"rlm_sql_iodbc",
NULL,
sql_socket_init,
sql_query,
sql_select_query,
sql_store_result,
sql_num_fields,
sql_num_rows,
sql_fetch_row,
sql_free_result,
sql_error,
sql_finish_query,
sql_finish_select_query,
sql_affected_rows
.name = "rlm_sql_iodbc",
.sql_socket_init = sql_socket_init,
.sql_query = sql_query,
.sql_select_query = sql_select_query,
.sql_store_result = sql_store_result,
.sql_num_fields = sql_num_fields,
.sql_num_rows = sql_num_rows,
.sql_fetch_row = sql_fetch_row,
.sql_free_result = sql_free_result,
.sql_error = sql_error,
.sql_finish_query = sql_finish_query,
.sql_finish_select_query = sql_finish_select_query,
.sql_affected_rows = sql_affected_rows
};
28 changes: 14 additions & 14 deletions src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
View file
Expand Up @@ -573,18 +573,18 @@ static int sql_affected_rows(rlm_sql_handle_t * handle, UNUSED rlm_sql_config_t

/* Exported to rlm_sql */
rlm_sql_module_t rlm_sql_mysql = {
"rlm_sql_mysql",
mod_instantiate,
sql_socket_init,
sql_query,
sql_select_query,
sql_store_result,
sql_num_fields,
sql_num_rows,
sql_fetch_row,
sql_free_result,
sql_error,
sql_finish_query,
sql_finish_select_query,
sql_affected_rows
.name = "rlm_sql_mysql",
.mod_instantiate = mod_instantiate,
.sql_socket_init = sql_socket_init,
.sql_query = sql_query,
.sql_select_query = sql_select_query,
.sql_store_result = sql_store_result,
.sql_num_fields = sql_num_fields,
.sql_num_rows = sql_num_rows,
.sql_fetch_row = sql_fetch_row,
.sql_free_result = sql_free_result,
.sql_error = sql_error,
.sql_finish_query = sql_finish_query,
.sql_finish_select_query = sql_finish_select_query,
.sql_affected_rows = sql_affected_rows
};
27 changes: 13 additions & 14 deletions src/modules/rlm_sql/drivers/rlm_sql_null/rlm_sql_null.c
View file
Expand Up @@ -201,18 +201,17 @@ static int sql_affected_rows(UNUSED rlm_sql_handle_t * handle, UNUSED rlm_sql_co

/* Exported to rlm_sql */
rlm_sql_module_t rlm_sql_null = {
"rlm_sql_null",
NULL,
sql_socket_init,
sql_query,
sql_select_query,
sql_store_result,
sql_num_fields,
sql_num_rows,
sql_fetch_row,
sql_free_result,
sql_error,
sql_finish_query,
sql_finish_select_query,
sql_affected_rows
.name = "rlm_sql_null",
.sql_socket_init = sql_socket_init,
.sql_query = sql_query,
.sql_select_query = sql_select_query,
.sql_store_result = sql_store_result,
.sql_num_fields = sql_num_fields,
.sql_num_rows = sql_num_rows,
.sql_fetch_row = sql_fetch_row,
.sql_free_result = sql_free_result,
.sql_error = sql_error,
.sql_finish_query = sql_finish_query,
.sql_finish_select_query = sql_finish_select_query,
.sql_affected_rows = sql_affected_rows
};
27 changes: 13 additions & 14 deletions src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
View file
Expand Up @@ -553,18 +553,17 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, rlm_sql_config_t *config)

/* Exported to rlm_sql */
rlm_sql_module_t rlm_sql_oracle = {
"rlm_sql_oracle",
NULL,
sql_socket_init,
sql_query,
sql_select_query,
sql_store_result,
sql_num_fields,
sql_num_rows,
sql_fetch_row,
sql_free_result,
sql_error,
sql_finish_query,
sql_finish_select_query,
sql_affected_rows
.name = "rlm_sql_oracle",
.sql_socket_init = sql_socket_init,
.sql_query = sql_query,
.sql_select_query = sql_select_query,
.sql_store_result = sql_store_result,
.sql_num_fields = sql_num_fields,
.sql_num_rows = sql_num_rows,
.sql_fetch_row = sql_fetch_row,
.sql_free_result = sql_free_result,
.sql_error = sql_error,
.sql_finish_query = sql_finish_query,
.sql_finish_select_query = sql_finish_select_query,
.sql_affected_rows = sql_affected_rows
};
25 changes: 11 additions & 14 deletions src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
View file
Expand Up @@ -481,18 +481,15 @@ static int sql_affected_rows(rlm_sql_handle_t * handle, UNUSED rlm_sql_config_t

/* Exported to rlm_sql */
rlm_sql_module_t rlm_sql_postgresql = {
"rlm_sql_postgresql",
mod_instantiate,
sql_init_socket,
sql_query,
sql_select_query,
NULL, /* sql_store_result */
sql_num_fields,
NULL, /* sql_num_rows */
sql_fetch_row,
NULL, /* sql_free_result */
sql_error,
sql_free_result,
sql_free_result,
sql_affected_rows,
.name = "rlm_sql_postgresql",
.mod_instantiate = mod_instantiate,
.sql_init_socket = sql_init_socket,
.sql_query = sql_query,
.sql_select_query = sql_select_query,
.sql_num_fields = sql_num_fields,
.sql_fetch_row = sql_fetch_row,
.sql_error = sql_error,
.sql_finish_query = sql_free_result,
.sql_finish_select_query = sql_free_result,
.sql_affected_rows = sql_affected_rows
};
28 changes: 14 additions & 14 deletions src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
View file
Expand Up @@ -646,18 +646,18 @@ static int sql_affected_rows(rlm_sql_handle_t *handle,

/* Exported to rlm_sql */
rlm_sql_module_t rlm_sql_sqlite = {
"rlm_sql_sqlite",
mod_instantiate,
sql_socket_init,
sql_query,
sql_select_query,
sql_store_result,
sql_num_fields,
sql_num_rows,
sql_fetch_row,
sql_free_result,
sql_error,
sql_finish_query,
sql_finish_query,
sql_affected_rows
.name = "rlm_sql_sqlite",
.mod_instantiate = mod_instantiate,
.sql_socket_init = sql_socket_init,
.sql_query = sql_query,
.sql_select_query = sql_select_query,
.sql_store_result = sql_store_result,
.sql_num_fields = sql_num_fields,
.sql_num_rows = sql_num_rows,
.sql_fetch_row = sql_fetch_row,
.sql_free_result = sql_free_result,
.sql_error = sql_error,
.sql_finish_query = sql_finish_query,
.sql_finish_select_query = sql_finish_query,
.sql_affected_rows = sql_affected_rows
};
27 changes: 13 additions & 14 deletions src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
View file
Expand Up @@ -445,18 +445,17 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, rlm_sql_config_t *config)

/* Exported to rlm_sql */
rlm_sql_module_t rlm_sql_unixodbc = {
"rlm_sql_unixodbc",
NULL,
sql_socket_init,
sql_query,
sql_select_query,
sql_store_result,
sql_num_fields,
sql_num_rows,
sql_fetch_row,
sql_free_result,
sql_error,
sql_finish_query,
sql_finish_select_query,
sql_affected_rows
.name = "rlm_sql_unixodbc",
.sql_socket_init = sql_socket_init,
.sql_query = sql_query,
.sql_select_query = sql_select_query,
.sql_store_result = sql_store_result,
.sql_num_fields = sql_num_fields,
.sql_num_rows = sql_num_rows,
.sql_fetch_row = sql_fetch_row,
.sql_free_result = sql_free_result,
.sql_error = sql_error,
.sql_finish_query = sql_finish_query,
.sql_finish_select_query = sql_finish_select_query,
.sql_affected_rows = sql_affected_rows
};
6 changes: 6 additions & 0 deletions src/modules/rlm_sql/rlm_sql.h
View file
Expand Up @@ -112,16 +112,22 @@ typedef struct rlm_sql_module_t {

sql_rcode_t (*mod_instantiate)(CONF_SECTION *conf, rlm_sql_config_t *config);
sql_rcode_t (*sql_socket_init)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);

sql_rcode_t (*sql_query)(rlm_sql_handle_t *handle, rlm_sql_config_t *config, char const *query);
sql_rcode_t (*sql_select_query)(rlm_sql_handle_t *handle, rlm_sql_config_t *config, char const *query);
sql_rcode_t (*sql_store_result)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);

int (*sql_num_fields)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
int (*sql_num_rows)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);

sql_rcode_t (*sql_fetch_row)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
sql_rcode_t (*sql_free_result)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);

char const *(*sql_error)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);

sql_rcode_t (*sql_finish_query)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
sql_rcode_t (*sql_finish_select_query)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);

int (*sql_affected_rows)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
} rlm_sql_module_t;

Expand Down

0 comments on commit 6973488

Please sign in to comment.