MT#61444 sipwise_vm_ext_timezone: remove build warning

> apps/app_voicemail.c:8211:26: warning: the comparison will always evaluate as 'false' for the address of 'mailbox' will never be NULL [-Waddress]
>  8211 | if (vmu->mailbox == NULL || ast_strlen_zero(sw_timezone_table))
>       | ^~
> apps/app_voicemail.c:767:14: note: 'mailbox' declared here
>   767 | char mailbox[MAX_VM_MBOX_ID_LEN]; /*!< granig: the mailbox uuid */
>       | ^~~~~~~
>

Change-Id: I077dd5f834cac9ee2436701a15f51e13783c20e5
(cherry picked from commit 271f51e421)
mr12.5
Victor Seva 2 years ago
parent 2e906528bd
commit 34cdc5c028

@ -7,7 +7,7 @@ Subject: sipwise_add_actions_wmi
1 file changed, 280 insertions(+), 22 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 0dbe9cb..35228e6 100644
index 28c2c5b..dd5616e 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1043,6 +1043,52 @@ static int adsiver = 1;

@ -7,7 +7,7 @@ Subject: sipwise_fix_app_voicemail_bugs
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b617d0e..209b825 100644
index 677baa0..47414b2 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1221,7 +1221,7 @@ static int findreplen(const char *rep, int nmat, const int *replen)

@ -7,7 +7,7 @@ Subject: sipwise_fix_chan_usage
1 file changed, 2 insertions(+)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 6a7e6b9..e61af4d 100644
index fb339b4..03a148c 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -14389,7 +14389,9 @@ AST_TEST_DEFINE(test_voicemail_msgcount)

@ -7,7 +7,7 @@ Subject: sipwise_vm_add_arabic_support
1 file changed, 94 insertions(+), 2 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 4a81784..beee9a0 100644
index 3fc129d..332d315 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -8491,8 +8491,10 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc

@ -7,7 +7,7 @@ Subject: sipwise_vm_add_callid
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 873265e..26bd50e 100644
index b456865..9c22f42 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -858,7 +858,7 @@ static char odbc_database[80] = "asterisk";

@ -7,7 +7,7 @@ Subject: sipwise_vm_ast_load_realtime_use_uuid
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index d1b2f99..c7b55a5 100644
index 6198446..dfd6e33 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1752,7 +1752,7 @@ static int is_valid_dtmf(const char *key)

@ -7,7 +7,7 @@ Subject: sipwise_vm_ext_timezone
1 file changed, 67 insertions(+)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index f2d3583..9b1f435 100644
index f2d3583..ca52dbc 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -948,6 +948,8 @@ static int passwordlocation;
@ -49,7 +49,7 @@ index f2d3583..9b1f435 100644
+ struct odbc_obj *obj = NULL;
+ SQLHSTMT stmt = NULL;
+
+ if (vmu->mailbox == NULL || ast_strlen_zero(sw_timezone_table))
+ if (ast_strlen_zero(sw_timezone_table))
+ return;
+
+ snprintf(sql, sizeof(sql),

@ -7,7 +7,7 @@ Subject: sipwise_vm_externnotify_by_uuid
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 209b825..ef55d17 100644
index 47414b2..aecf2a9 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6312,15 +6312,15 @@ static void run_externnotify(const char *context, const char *extension, const c

@ -7,7 +7,7 @@ Subject: sipwise_vm_find_user_by_alias_prio_uuid
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 26bd50e..d1b2f99 100644
index 9c22f42..6198446 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -4138,26 +4138,26 @@ static struct ast_vm_user *find_user_realtime_by_alias(struct ast_vm_user *ivm,

@ -22,7 +22,7 @@ index ce13bbf..a2ef134 100644
all: _all
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 9b1f435..873265e 100644
index ca52dbc..b456865 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -4957,16 +4957,11 @@ static int vm_delete(char *file)

@ -7,7 +7,7 @@ Subject: sipwise_vm_fix_double_menu
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 35228e6..e29d406 100644
index dd5616e..06112f4 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -12222,16 +12222,7 @@ static int vm_execmain(struct ast_channel *chan, const char *data)

@ -7,7 +7,7 @@ Subject: sipwise_vm_fix_envelope_play
1 file changed, 14 insertions(+)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 8269bc3..1d2170b 100644
index 84db805..758fdf1 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -11619,11 +11619,25 @@ static int vm_execmain(struct ast_channel *chan, const char *data)

@ -7,7 +7,7 @@ Subject: sipwise_vm_fix_odbc_retreive_file
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index c7b55a5..6a7e6b9 100644
index dfd6e33..fb339b4 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -4092,7 +4092,9 @@ static int retrieve_file(char *dir, int msgnum)

@ -7,7 +7,7 @@ Subject: sipwise_vm_fix_prev_message
1 file changed, 1 insertion(+)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index beee9a0..0dbe9cb 100644
index 332d315..28c2c5b 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -11412,6 +11412,7 @@ static int vm_execmain(struct ast_channel *chan, const char *data)

@ -7,7 +7,7 @@ Subject: sipwise_vm_hebrew_language_fixups
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index ef55d17..4a81784 100644
index aecf2a9..3fc129d 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -8490,10 +8490,14 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc

@ -7,7 +7,7 @@ Subject: sipwise_vm_pointers_malloc
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 1d2170b..b617d0e 100644
index 758fdf1..677baa0 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1268,7 +1268,7 @@ static char *edit(const char *str, int len, const char *rep,

@ -7,7 +7,7 @@ Subject: sipwise_vm_store_message_add_diag_info
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index e61af4d..8269bc3 100644
index 03a148c..84db805 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -4482,6 +4482,10 @@ static SQLHSTMT insert_data_cb(struct odbc_obj *obj, void *vdata)

Loading…
Cancel
Save