From 53459f86b2df0a2cd655a8c51dccd63073eacb87 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 9 Jun 2008 22:51:59 +0000 Subject: Expand RQ_INTEGER type out to multiple types, one for each precision git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@121367 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 12 +++++++++--- apps/app_queue.c | 2 +- apps/app_voicemail.c | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'apps') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 14ba77b5e..c1acfc258 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1743,7 +1743,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c if (rt_log_members) { /* Update table */ snprintf(members, sizeof(members), "%d", conf->users); - ast_realtime_require_field("meetme", "confno", RQ_INTEGER, strlen(conf->confno), "members", RQ_INTEGER, strlen(members), NULL); + ast_realtime_require_field("meetme", + "confno", strlen(conf->confno) > 7 ? RQ_UINTEGER4 : strlen(conf->confno) > 4 ? RQ_UINTEGER3 : RQ_UINTEGER2, strlen(conf->confno), + "members", RQ_UINTEGER1, strlen(members), + NULL); ast_update_realtime("meetme", "confno", conf->confno, "members", members, NULL); } setusercount = 1; @@ -2683,7 +2686,10 @@ bailoutandtrynormal: if (rt_log_members) { /* Update table */ snprintf(members, sizeof(members), "%d", conf->users); - ast_realtime_require_field("meetme", "confno", RQ_INTEGER, strlen(conf->confno), "members", RQ_INTEGER, strlen(members), NULL); + ast_realtime_require_field("meetme", + "confno", strlen(conf->confno) > 7 ? RQ_UINTEGER4 : strlen(conf->confno) > 4 ? RQ_UINTEGER3 : RQ_UINTEGER2, strlen(conf->confno), + "members", RQ_UINTEGER1, strlen(members), + NULL); ast_update_realtime("meetme", "confno", conf->confno, "members", members, NULL); } if (confflags & CONFFLAG_MARKEDUSER) @@ -5710,7 +5716,7 @@ static int load_module(void) res |= ast_devstate_prov_add("SLA", sla_state); res |= ast_custom_function_register(&meetme_info_acf); - ast_realtime_require_field("meetme", "confno", RQ_INTEGER, 3, "members", RQ_INTEGER, 3, NULL); + ast_realtime_require_field("meetme", "confno", RQ_UINTEGER2, 3, "members", RQ_UINTEGER1, 3, NULL); return res; } diff --git a/apps/app_queue.c b/apps/app_queue.c index 2a7f1e612..9d9579739 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -6336,7 +6336,7 @@ static int load_module(void) if (!(device_state_sub = ast_event_subscribe(AST_EVENT_DEVICE_STATE, device_state_cb, NULL, AST_EVENT_IE_END))) res = -1; - ast_realtime_require_field("queue_members", "paused", RQ_INTEGER, 1, "uniqueid", RQ_INTEGER, 5, NULL); + ast_realtime_require_field("queue_members", "paused", RQ_INTEGER1, 1, "uniqueid", RQ_UINTEGER2, 5, NULL); return res ? AST_MODULE_LOAD_DECLINE : 0; } diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 3ff833ea6..24b7ee3c7 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -10089,8 +10089,8 @@ static int load_module(void) ast_cli_register_multiple(cli_voicemail, sizeof(cli_voicemail) / sizeof(struct ast_cli_entry)); ast_install_vm_functions(has_voicemail, inboxcount, messagecount, sayname); - ast_realtime_require_field("voicemail", "uniqueid", RQ_INTEGER, 11, "password", RQ_CHAR, 10, NULL); - ast_realtime_require_field("voicemail_data", "filename", RQ_CHAR, 30, "duration", RQ_INTEGER, 5, NULL); + ast_realtime_require_field("voicemail", "uniqueid", RQ_UINTEGER3, 11, "password", RQ_CHAR, 10, NULL); + ast_realtime_require_field("voicemail_data", "filename", RQ_CHAR, 30, "duration", RQ_UINTEGER3, 5, NULL); return res; } -- cgit v1.2.3