diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-03-24 13:28:21 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-03-24 13:28:21 -0500 |
| commit | d3af5320d43c73f0655ebaad1c818292c1250cc7 (patch) | |
| tree | 2f830c994f1934c30b8c094c2dc01cdd0020cbe8 | |
| parent | c5170677e72e48b487462e79a31974845a417dce (diff) | |
| parent | c6e4c48e67a78940e4dd17805ba74416023365ae (diff) | |
Merge "config: fix flags in uint option handler" into 13
| -rw-r--r-- | apps/app_skel.c | 2 | ||||
| -rw-r--r-- | main/config_options.c | 2 | ||||
| -rw-r--r-- | res/res_pjsip/pjsip_options.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_skel.c b/apps/app_skel.c index 337539efe..3da3db0fc 100644 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -739,7 +739,7 @@ static int load_module(void) /* Level options */ aco_option_register(&cfg_info, "max_number", ACO_EXACT, level_options, NULL, OPT_UINT_T, 0, FLDSET(struct skel_level, max_num)); - aco_option_register(&cfg_info, "max_guesses", ACO_EXACT, level_options, NULL, OPT_UINT_T, 1, FLDSET(struct skel_level, max_guesses)); + aco_option_register(&cfg_info, "max_guesses", ACO_EXACT, level_options, NULL, OPT_UINT_T, 0, FLDSET(struct skel_level, max_guesses)); if (aco_process_config(&cfg_info, 0) == ACO_PROCESS_ERROR) { goto error; diff --git a/main/config_options.c b/main/config_options.c index 5da310fd8..db99a441d 100644 --- a/main/config_options.c +++ b/main/config_options.c @@ -1346,7 +1346,7 @@ static int int_handler_fn(const struct aco_option *opt, struct ast_variable *var */ static int uint_handler_fn(const struct aco_option *opt, struct ast_variable *var, void *obj) { unsigned int *field = (unsigned int *)(obj + opt->args[0]); - unsigned int flags = PARSE_INT32 | opt->flags; + unsigned int flags = PARSE_UINT32 | opt->flags; int res = 0; if (opt->flags & PARSE_IN_RANGE) { res = opt->flags & PARSE_DEFAULT ? diff --git a/res/res_pjsip/pjsip_options.c b/res/res_pjsip/pjsip_options.c index de551dc0a..157a07741 100644 --- a/res/res_pjsip/pjsip_options.c +++ b/res/res_pjsip/pjsip_options.c @@ -1038,14 +1038,14 @@ int ast_sip_initialize_sorcery_qualify(void) snprintf(status_value_unknown, sizeof(status_value_unknown), "%u", UNKNOWN); ast_sorcery_object_field_register_nodoc(sorcery, CONTACT_STATUS, "last_status", - status_value_unknown, OPT_UINT_T, 1, FLDSET(struct ast_sip_contact_status, last_status)); + status_value_unknown, OPT_UINT_T, 0, FLDSET(struct ast_sip_contact_status, last_status)); snprintf(status_value_created, sizeof(status_value_created), "%u", CREATED); ast_sorcery_object_field_register_nodoc(sorcery, CONTACT_STATUS, "status", - status_value_created, OPT_UINT_T, 1, FLDSET(struct ast_sip_contact_status, status)); + status_value_created, OPT_UINT_T, 0, FLDSET(struct ast_sip_contact_status, status)); ast_sorcery_object_field_register_custom_nodoc(sorcery, CONTACT_STATUS, "rtt_start", "0.0", rtt_start_handler, rtt_start_to_str, NULL, 0, 0); ast_sorcery_object_field_register_nodoc(sorcery, CONTACT_STATUS, "rtt", - "0", OPT_UINT_T, 1, FLDSET(struct ast_sip_contact_status, rtt)); + "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_contact_status, rtt)); return 0; } |