summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/cdr.c2
-rw-r--r--main/cel.c2
-rw-r--r--main/features_config.c2
-rw-r--r--main/parking.c4
-rw-r--r--main/stasis_config.c2
-rw-r--r--main/udptl.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/main/cdr.c b/main/cdr.c
index 967dfaad4..966899969 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -3949,7 +3949,7 @@ static int process_config(int reload)
*/
if (!reload && !(aco_set_defaults(&general_option, "general", mod_cfg->general))) {
ast_log(LOG_NOTICE, "Failed to process CDR configuration; using defaults\n");
- ao2_global_obj_replace(module_configs, mod_cfg);
+ ao2_global_obj_replace_unref(module_configs, mod_cfg);
return 0;
}
return 1;
diff --git a/main/cel.c b/main/cel.c
index 6d63bf5f8..f4296f0dd 100644
--- a/main/cel.c
+++ b/main/cel.c
@@ -1503,7 +1503,7 @@ int ast_cel_engine_init(void)
*/
if (!aco_set_defaults(&general_option, "general", cel_cfg->general)) {
ast_log(LOG_NOTICE, "Failed to process CEL configuration; using defaults\n");
- ao2_global_obj_replace(cel_configs, cel_cfg);
+ ao2_global_obj_replace_unref(cel_configs, cel_cfg);
}
}
diff --git a/main/features_config.c b/main/features_config.c
index 64bb2abd5..68b7dde08 100644
--- a/main/features_config.c
+++ b/main/features_config.c
@@ -1748,7 +1748,7 @@ static int load_config(void)
}
ast_log(LOG_NOTICE, "Could not load features config; using defaults\n");
- ao2_global_obj_replace(globals, features_cfg);
+ ao2_global_obj_replace_unref(globals, features_cfg);
}
return 0;
diff --git a/main/parking.c b/main/parking.c
index 9a92e6e15..f4ed27d61 100644
--- a/main/parking.c
+++ b/main/parking.c
@@ -216,7 +216,7 @@ int ast_parking_register_bridge_features(struct ast_parking_bridge_feature_fn_ta
}
*wrapper = *fn_table;
- ao2_global_obj_replace(parking_provider, wrapper);
+ ao2_global_obj_replace_unref(parking_provider, wrapper);
return 0;
}
@@ -234,7 +234,7 @@ int ast_parking_unregister_bridge_features(const char *module_name)
return -1;
}
- ao2_global_obj_replace_unref(parking_provider, NULL);
+ ao2_global_obj_release(parking_provider);
return 0;
}
diff --git a/main/stasis_config.c b/main/stasis_config.c
index 349d41583..006df51dd 100644
--- a/main/stasis_config.c
+++ b/main/stasis_config.c
@@ -157,7 +157,7 @@ static int process_config(int reload)
if (conf && !reload
&& !aco_set_defaults(&threadpool_option, "threadpool", conf->threadpool)) {
ast_log(AST_LOG_NOTICE, "Failed to process Stasis configuration; using defaults\n");
- ao2_global_obj_replace(confs, conf);
+ ao2_global_obj_replace_unref(confs, conf);
return 0;
}
return -1;
diff --git a/main/udptl.c b/main/udptl.c
index 25a4cc02c..fa9171742 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -1468,7 +1468,7 @@ static void __ast_udptl_reload(int reload)
}
ast_log(LOG_NOTICE, "Could not load udptl config; using defaults\n");
- ao2_global_obj_replace(globals, udptl_cfg);
+ ao2_global_obj_replace_unref(globals, udptl_cfg);
}
}
}