Skip to content

Commit 9cfde81

Browse files
jamescowensjamescowens
authored
Merge pull request #2816 from jamescowens/update_embedded_bdb53_gcc15_compat
bdb53: Update embedded bdb53 code for gcc15+
2 parents ab64d28 + b173906 commit 9cfde81

File tree

1 file changed

+42
-42
lines changed

1 file changed

+42
-42
lines changed

‎src/bdb53/src/env/env_config.c‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -72,47 +72,47 @@ typedef int (*CFG_FUNC_2UINT) __P((DB_ENV *, u_int32_t, u_int32_t));
7272
* set_tas_spins mutex_set_tas_spins
7373
*/
7474
static const CFG_DESC config_descs[] = {
75-
{ "add_data_dir", CFG_STRING, __env_add_data_dir },
76-
{ "db_data_dir", CFG_STRING, __env_set_data_dir },
77-
{ "db_log_dir", CFG_STRING, __log_set_lg_dir },
78-
{ "db_tmp_dir", CFG_STRING, __env_set_tmp_dir },
79-
{ "mutex_set_align", CFG_UINT, __mutex_set_align },
80-
{ "mutex_set_increment", CFG_UINT, __mutex_set_increment },
81-
{ "mutex_set_init", CFG_UINT, __mutex_set_init },
82-
{ "mutex_set_max", CFG_UINT, __mutex_set_max },
83-
{ "mutex_set_tas_spins", CFG_UINT, __mutex_set_tas_spins },
84-
{ "rep_set_clockskew", CFG_2UINT, __rep_set_clockskew },
85-
{ "rep_set_limit", CFG_2UINT, __rep_set_limit },
86-
{ "rep_set_nsites", CFG_UINT, __rep_set_nsites_pp },
87-
{ "rep_set_priority", CFG_UINT, __rep_set_priority },
88-
{ "rep_set_request", CFG_2UINT, __rep_set_request },
89-
{ "set_cache_max", CFG_2UINT, __memp_set_cache_max },
90-
{ "set_create_dir", CFG_STRING, __env_set_create_dir },
91-
{ "set_data_dir", CFG_STRING, __env_set_data_dir },
92-
{ "set_data_len", CFG_UINT, __env_set_data_len },
93-
{ "set_intermediate_dir_mode",CFG_STRING, __env_set_intermediate_dir_mode },
94-
{ "set_lg_bsize", CFG_UINT, __log_set_lg_bsize },
95-
{ "set_lg_dir", CFG_STRING, __log_set_lg_dir },
96-
{ "set_lg_filemode", CFG_INT, __log_set_lg_filemode },
97-
{ "set_lg_max", CFG_UINT, __log_set_lg_max },
98-
{ "set_lg_regionmax", CFG_UINT, __log_set_lg_regionmax },
99-
{ "set_lk_max_lockers", CFG_UINT, __lock_set_lk_max_lockers },
100-
{ "set_lk_max_locks", CFG_UINT, __lock_set_lk_max_locks },
101-
{ "set_lk_max_objects", CFG_UINT, __lock_set_lk_max_objects },
102-
{ "set_lk_partitions", CFG_UINT, __lock_set_lk_partitions },
103-
{ "set_lk_tablesize", CFG_UINT, __lock_set_lk_tablesize },
104-
{ "set_memory_max", CFG_2UINT, __env_set_memory_max },
105-
{ "set_metadata_dir", CFG_STRING, __env_set_metadata_dir },
106-
{ "set_mp_max_openfd", CFG_INT, __memp_set_mp_max_openfd },
107-
{ "set_mp_max_write", CFG_2INT, __memp_set_mp_max_write },
108-
{ "set_mp_mmapsize", CFG_UINT, __memp_set_mp_mmapsize },
109-
{ "set_mp_mtxcount", CFG_UINT, __memp_set_mp_mtxcount },
110-
{ "set_mp_pagesize", CFG_UINT, __memp_set_mp_pagesize },
111-
{ "set_shm_key", CFG_LONG, __env_set_shm_key },
112-
{ "set_tas_spins", CFG_UINT, __mutex_set_tas_spins },
113-
{ "set_thread_count", CFG_UINT, __env_set_thread_count },
114-
{ "set_tmp_dir", CFG_STRING, __env_set_tmp_dir },
115-
{ "set_tx_max", CFG_UINT, __txn_set_tx_max }
75+
{ "add_data_dir", CFG_STRING, (int (*)(void))__env_add_data_dir },
76+
{ "db_data_dir", CFG_STRING, (int (*)(void))__env_set_data_dir },
77+
{ "db_log_dir", CFG_STRING, (int (*)(void))__log_set_lg_dir },
78+
{ "db_tmp_dir", CFG_STRING, (int (*)(void))__env_set_tmp_dir },
79+
{ "mutex_set_align", CFG_UINT, (int (*)(void))__mutex_set_align },
80+
{ "mutex_set_increment", CFG_UINT, (int (*)(void))__mutex_set_increment },
81+
{ "mutex_set_init", CFG_UINT, (int (*)(void))__mutex_set_init },
82+
{ "mutex_set_max", CFG_UINT, (int (*)(void))__mutex_set_max },
83+
{ "mutex_set_tas_spins", CFG_UINT, (int (*)(void))__mutex_set_tas_spins },
84+
{ "rep_set_clockskew", CFG_2UINT, (int (*)(void))__rep_set_clockskew },
85+
{ "rep_set_limit", CFG_2UINT, (int (*)(void))__rep_set_limit },
86+
{ "rep_set_nsites", CFG_UINT, (int (*)(void))__rep_set_nsites_pp },
87+
{ "rep_set_priority", CFG_UINT, (int (*)(void))__rep_set_priority },
88+
{ "rep_set_request", CFG_2UINT, (int (*)(void))__rep_set_request },
89+
{ "set_cache_max", CFG_2UINT, (int (*)(void))__memp_set_cache_max },
90+
{ "set_create_dir", CFG_STRING, (int (*)(void))__env_set_create_dir },
91+
{ "set_data_dir", CFG_STRING, (int (*)(void))__env_set_data_dir },
92+
{ "set_data_len", CFG_UINT, (int (*)(void))__env_set_data_len },
93+
{ "set_intermediate_dir_mode",CFG_STRING, (int (*)(void))__env_set_intermediate_dir_mode },
94+
{ "set_lg_bsize", CFG_UINT, (int (*)(void))__log_set_lg_bsize },
95+
{ "set_lg_dir", CFG_STRING, (int (*)(void))__log_set_lg_dir },
96+
{ "set_lg_filemode", CFG_INT, (int (*)(void))__log_set_lg_filemode },
97+
{ "set_lg_max", CFG_UINT, (int (*)(void))__log_set_lg_max },
98+
{ "set_lg_regionmax", CFG_UINT, (int (*)(void))__log_set_lg_regionmax },
99+
{ "set_lk_max_lockers", CFG_UINT, (int (*)(void))__lock_set_lk_max_lockers },
100+
{ "set_lk_max_locks", CFG_UINT, (int (*)(void))__lock_set_lk_max_locks },
101+
{ "set_lk_max_objects", CFG_UINT, (int (*)(void))__lock_set_lk_max_objects },
102+
{ "set_lk_partitions", CFG_UINT, (int (*)(void))__lock_set_lk_partitions },
103+
{ "set_lk_tablesize", CFG_UINT, (int (*)(void))__lock_set_lk_tablesize },
104+
{ "set_memory_max", CFG_2UINT, (int (*)(void))__env_set_memory_max },
105+
{ "set_metadata_dir", CFG_STRING, (int (*)(void))__env_set_metadata_dir },
106+
{ "set_mp_max_openfd", CFG_INT, (int (*)(void))__memp_set_mp_max_openfd },
107+
{ "set_mp_max_write", CFG_2INT, (int (*)(void))__memp_set_mp_max_write },
108+
{ "set_mp_mmapsize", CFG_UINT, (int (*)(void))__memp_set_mp_mmapsize },
109+
{ "set_mp_mtxcount", CFG_UINT, (int (*)(void))__memp_set_mp_mtxcount },
110+
{ "set_mp_pagesize", CFG_UINT, (int (*)(void))__memp_set_mp_pagesize },
111+
{ "set_shm_key", CFG_LONG, (int (*)(void))__env_set_shm_key },
112+
{ "set_tas_spins", CFG_UINT, (int (*)(void))__mutex_set_tas_spins },
113+
{ "set_thread_count", CFG_UINT, (int (*)(void))__env_set_thread_count },
114+
{ "set_tmp_dir", CFG_STRING, (int (*)(void))__env_set_tmp_dir },
115+
{ "set_tx_max", CFG_UINT, (int (*)(void))__txn_set_tx_max }
116116
};
117117

118118
/*
@@ -684,7 +684,7 @@ cmp_cfg_name(sought, element)
684684

685685
/*
686686
* __config_scan --
687-
* Split DB_CONFIG lines into fields. Usually each whitespace separated
687+
* Split DB_CONFIG lines into fields. Usually each whitespace separated
688688
* field is scanned as a distinct argument. However, if the command is
689689
* recognized as one needing a single string value, then the rest of the
690690
* line is returned as the one argument. That supports strings which

0 commit comments

Comments
 (0)