[svn-commits] seanbright: branch seanbright/resolve-shadow-warnings r136818 - in /team/sean...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Aug 8 12:52:43 CDT 2008
Author: seanbright
Date: Fri Aug 8 12:52:42 2008
New Revision: 136818
URL: http://svn.digium.com/view/asterisk?view=rev&rev=136818
Log:
Forgot to compile with ODBC or IMAP enabled when working on this branch.
Modified:
team/seanbright/resolve-shadow-warnings/apps/app_voicemail.c
team/seanbright/resolve-shadow-warnings/include/asterisk/channel.h
Modified: team/seanbright/resolve-shadow-warnings/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/apps/app_voicemail.c?view=diff&rev=136818&r1=136817&r2=136818
==============================================================================
--- team/seanbright/resolve-shadow-warnings/apps/app_voicemail.c (original)
+++ team/seanbright/resolve-shadow-warnings/apps/app_voicemail.c Fri Aug 8 12:52:42 2008
@@ -1716,12 +1716,12 @@
int tempcopy = 0;
STRING str;
int ret; /* for better error checking */
- char *imapflags = NIL;
+ char *imap_flags = NIL;
/* Set urgent flag for IMAP message */
if (!ast_strlen_zero(flag) && !strcmp(flag, "Urgent")) {
ast_debug(3, "Setting message flag \\\\FLAGGED.\n");
- imapflags="\\FLAGGED";
+ imap_flags="\\FLAGGED";
}
/* Attach only the first format */
@@ -1790,7 +1790,7 @@
ret = init_mailstream(vms, NEW_FOLDER);
if (ret == 0) {
imap_mailbox_name(mailbox, sizeof(mailbox), vms, NEW_FOLDER, 1);
- if(!mail_append_full(vms->mailstream, mailbox, imapflags, NIL, &str))
+ if(!mail_append_full(vms->mailstream, mailbox, imap_flags, NIL, &str))
ast_log(LOG_ERROR, "Error while sending the message to %s\n", mailbox);
fclose(p);
unlink(tmp);
@@ -1905,13 +1905,13 @@
static int has_voicemail(const char *mailbox, const char *folder)
{
- char tmp[256], *tmp2, *mbox, *context;
+ char tmp[256], *tmp2, *box, *context;
ast_copy_string(tmp, mailbox, sizeof(tmp));
tmp2 = tmp;
if (strchr(tmp2, ',')) {
- while ((mbox = strsep(&tmp2, ","))) {
- if (!ast_strlen_zero(mbox)) {
- if (has_voicemail(mbox, folder))
+ while ((box = strsep(&tmp2, ","))) {
+ if (!ast_strlen_zero(box)) {
+ if (has_voicemail(box, folder))
return 1;
}
}
@@ -2241,9 +2241,9 @@
}
-void mm_lsub(MAILSTREAM * stream, int delimiter, char *mailbox, long attributes)
-{
- ast_debug(5, "Delimiter set to %c and mailbox %s\n",delimiter, mailbox);
+void mm_lsub(MAILSTREAM * stream, int delim, char *mailbox, long attributes)
+{
+ ast_debug(5, "Delimiter set to %c and mailbox %s\n", delim, mailbox);
if (attributes & LATT_NOINFERIORS)
ast_debug(5, "no inferiors\n");
if (attributes & LATT_NOSELECT)
@@ -4338,13 +4338,13 @@
*/
static int has_voicemail(const char *mailbox, const char *folder)
{
- char tmp[256], *tmp2 = tmp, *mbox, *context;
+ char tmp[256], *tmp2 = tmp, *box, *context;
ast_copy_string(tmp, mailbox, sizeof(tmp));
- while ((context = mbox = strsep(&tmp2, ","))) {
+ while ((context = box = strsep(&tmp2, ","))) {
strsep(&context, "@");
if (ast_strlen_zero(context))
context = "default";
- if (messagecount(context, mbox, folder))
+ if (messagecount(context, box, folder))
return 1;
}
return 0;
@@ -10936,7 +10936,7 @@
int max_attempts = 3;
int attempts = 0;
int recorded = 0;
- int message_exists = 0;
+ int msg_exists = 0;
signed char zero_gain = 0;
char tempfile[PATH_MAX];
char *acceptdtmf = "#";
@@ -10960,7 +10960,7 @@
while ((cmd >= 0) && (cmd != 't')) {
switch (cmd) {
case '1':
- if (!message_exists) {
+ if (!msg_exists) {
/* In this case, 1 is to record a message */
cmd = '3';
break;
@@ -10986,7 +10986,7 @@
cmd = ast_stream_and_wait(chan, tempfile, AST_DIGIT_ANY);
break;
case '3':
- message_exists = 0;
+ msg_exists = 0;
/* Record */
if (recorded == 1)
ast_verb(3, "Re-recording the message\n");
@@ -11036,7 +11036,7 @@
#endif
} else {
/* If all is well, a message exists */
- message_exists = 1;
+ msg_exists = 1;
cmd = 0;
}
break;
@@ -11088,7 +11088,7 @@
cmd = ast_play_and_wait(chan, "vm-sorry");
break;
}
- if (message_exists || recorded) {
+ if (msg_exists || recorded) {
cmd = ast_play_and_wait(chan, "vm-saveoper");
if (!cmd)
cmd = ast_waitfordigit(chan, 3000);
@@ -11115,7 +11115,7 @@
their OGM's */
if (outsidecaller && !ast_test_flag(vmu, VM_REVIEW))
return cmd;
- if (message_exists) {
+ if (msg_exists) {
cmd = ast_play_and_wait(chan, "vm-review");
if (!cmd && outsidecaller) {
if ((flag && ast_strlen_zero(flag)) || (!ast_strlen_zero(flag) && strcmp(flag, "Urgent"))) {
Modified: team/seanbright/resolve-shadow-warnings/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/include/asterisk/channel.h?view=diff&rev=136818&r1=136817&r2=136818
==============================================================================
--- team/seanbright/resolve-shadow-warnings/include/asterisk/channel.h (original)
+++ team/seanbright/resolve-shadow-warnings/include/asterisk/channel.h Fri Aug 8 12:52:42 2008
@@ -1510,7 +1510,7 @@
}
/*! \brief Helper function for migrating select to poll */
-static inline int ast_fdisset(struct pollfd *pfds, int fd, int max, int *start)
+static inline int ast_fdisset(struct pollfd *pfds, int fd, int maximum, int *start)
{
int x;
int dummy=0;
@@ -1519,7 +1519,7 @@
return 0;
if (!start)
start = &dummy;
- for (x = *start; x<max; x++)
+ for (x = *start; x<maximum; x++)
if (pfds[x].fd == fd) {
if (x == *start)
(*start)++;
More information about the svn-commits
mailing list