From ed9e3ef23eee4b2d00f39454fb67f8501e40e6b6 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Fri, 28 Mar 2008 19:08:35 +0000
Subject: [PATCH] Replace magic number size from msgArray array with a define.
(same patch as before, I just split this part out)
(close issue #12326)
Reported by: travishein
Patches:
app_voicemail_code_documentation.patch uploaded by travishein (license 385)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_voicemail.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index d0fac87b1f..1460416564 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -399,6 +399,8 @@ struct vm_zone {
char msg_format[512];
};
+#define VMSTATE_MAX_MSG_ARRAY 256
+
/*! Voicemail mailbox state */
struct vm_state {
char curbox[80];
@@ -418,7 +420,7 @@ struct vm_state {
#ifdef IMAP_STORAGE
ast_mutex_t lock;
int updated; /*!< decremented on each mail check until 1 -allows delay */
- long msgArray[256];
+ long msgArray[VMSTATE_MAX_MSG_ARRAY];
MAILSTREAM *mailstream;
int vmArrayIndex;
char imapuser[80]; /*!< IMAP server login */
@@ -9946,7 +9948,7 @@ static void init_vm_state(struct vm_state *vms)
{
int x;
vms->vmArrayIndex = 0;
- for (x = 0; x < 256; x++) {
+ for (x = 0; x < VMSTATE_MAX_MSG_ARRAY; x++) {
vms->msgArray[x] = 0;
}
ast_mutex_init(&vms->lock);
@@ -9955,7 +9957,7 @@ static void init_vm_state(struct vm_state *vms)
static void check_msgArray(struct vm_state *vms)
{
int x;
- for (x = 0; x < 256; x++) {
+ for (x = 0; x < VMSTATE_MAX_MSG_ARRAY; x++) {
if (vms->msgArray[x] != 0) {
ast_debug(1, "Item %d set to %ld\n", x, vms->msgArray[x]);
}
@@ -9972,7 +9974,7 @@ static void check_msgArray(struct vm_state *vms)
static void copy_msgArray(struct vm_state *dst, struct vm_state *src)
{
int x;
- for (x = 0; x < 256; x++) {
+ for (x = 0; x < VMSTATE_MAX_MSG_ARRAY; x++) {
dst->msgArray[x] = src->msgArray[x];
}
}
--
GitLab