diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-04-13 05:45:46 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-04-13 05:45:46 -0500 |
| commit | 5e2a8ef94ad573f83a65b4d37b4f34ac947c07a2 (patch) | |
| tree | e232494ce2e0cad09efa2b6b218d381fbc993f69 /formats/format_wav.c | |
| parent | a22de46a06a1f1f6964e10f62216ef515a0e4e82 (diff) | |
| parent | f882ca25722b6290dc6e8d786452b0b26adceed1 (diff) | |
Merge "modules: change module LOAD_FAILUREs to LOAD_DECLINES" into 13
Diffstat (limited to 'formats/format_wav.c')
| -rw-r--r-- | formats/format_wav.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/formats/format_wav.c b/formats/format_wav.c index 90ef986ef..42a27e41b 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -538,22 +538,24 @@ static struct ast_format_def wav_f = { .desc_size = sizeof(struct wav_desc), }; +static int unload_module(void) +{ + return ast_format_def_unregister(wav_f.name) + || ast_format_def_unregister(wav16_f.name); +} + static int load_module(void) { wav_f.format = ast_format_slin; wav16_f.format = ast_format_slin16; if (ast_format_def_register(&wav_f) - || ast_format_def_register(&wav16_f)) - return AST_MODULE_LOAD_FAILURE; + || ast_format_def_register(&wav16_f)) { + unload_module(); + return AST_MODULE_LOAD_DECLINE; + } return AST_MODULE_LOAD_SUCCESS; } -static int unload_module(void) -{ - return ast_format_def_unregister(wav_f.name) - || ast_format_def_unregister(wav16_f.name); -} - AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Microsoft WAV/WAV16 format (8kHz/16kHz Signed Linear)", .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, |