From: Scott Griepentrog Date: Fri, 7 Mar 2014 22:07:52 +0000 (+0000) Subject: sorcery: correct field register argument list X-Git-Tag: 12.2.0-rc1~74 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c229ebf8e47a73bcc90a51db5db53f2183cd6a3e;p=thirdparty%2Fasterisk.git sorcery: correct field register argument list This fixes mistakes I previously made in merging gtjoseph's changes with mine. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@410211 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/include/asterisk/sorcery.h b/include/asterisk/sorcery.h index a1103366aa..98e8ee0121 100644 --- a/include/asterisk/sorcery.h +++ b/include/asterisk/sorcery.h @@ -530,7 +530,7 @@ int __ast_sorcery_object_field_register(struct ast_sorcery *sorcery, const char * \retval -1 failure */ #define ast_sorcery_object_field_register_alias(sorcery, type, name, default_val, opt_type, flags, ...) \ - __ast_sorcery_object_field_register(sorcery, type, name, default_val, opt_type, NULL, NULL, flags, 1, 1, VA_NARGS(__VA_ARGS__), __VA_ARGS__) + __ast_sorcery_object_field_register(sorcery, type, name, default_val, opt_type, NULL, NULL, NULL, flags, 1, 1, VA_NARGS(__VA_ARGS__), __VA_ARGS__) /*! * \brief Register a field within an object without documentation @@ -580,8 +580,8 @@ int __ast_sorcery_object_field_register(struct ast_sorcery *sorcery, const char * \retval 0 success * \retval -1 failure */ -#define ast_sorcery_object_field_register_custom_alias(sorcery, type, name, default_val, config_handler, sorcery_handler, flags, ...) \ - __ast_sorcery_object_field_register(sorcery, type, name, default_val, OPT_CUSTOM_T, config_handler, sorcery_handler, flags, 1, 1, VA_NARGS(__VA_ARGS__), __VA_ARGS__); +#define ast_sorcery_object_field_register_custom_alias(sorcery, type, name, default_val, config_handler, sorcery_handler, multiple_handler, flags, ...) \ + __ast_sorcery_object_field_register(sorcery, type, name, default_val, OPT_CUSTOM_T, config_handler, sorcery_handler, multiple_handler, flags, 1, 1, VA_NARGS(__VA_ARGS__), __VA_ARGS__); /*! * \brief Register a field within an object with custom handlers without documentation @@ -599,7 +599,7 @@ int __ast_sorcery_object_field_register(struct ast_sorcery *sorcery, const char * \retval -1 failure */ #define ast_sorcery_object_field_register_custom_nodoc(sorcery, type, name, default_val, config_handler, sorcery_handler, multiple_handler, flags, ...) \ - __ast_sorcery_object_field_register(sorcery, type, name, default_val, OPT_CUSTOM_T, config_handler, sorcery_handler, flags, 1, 0, VA_NARGS(__VA_ARGS__), __VA_ARGS__); + __ast_sorcery_object_field_register(sorcery, type, name, default_val, OPT_CUSTOM_T, config_handler, sorcery_handler, multiple_handler, flags, 1, 0, VA_NARGS(__VA_ARGS__), __VA_ARGS__); /*! * \brief Inform any wizards to load persistent objects