[svn-commits] oej: branch oej/pinefrog-rtcp-1.8 r413696 - in /team/oej/pinefrog-rtcp-1.8: ....
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon May 12 07:10:15 CDT 2014
Author: oej
Date: Mon May 12 07:10:04 2014
New Revision: 413696
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=413696
Log:
Reset and resolve
Modified:
team/oej/pinefrog-rtcp-1.8/ (props changed)
team/oej/pinefrog-rtcp-1.8/apps/app_adsiprog.c
team/oej/pinefrog-rtcp-1.8/apps/app_dial.c
team/oej/pinefrog-rtcp-1.8/apps/app_dumpchan.c
team/oej/pinefrog-rtcp-1.8/apps/app_festival.c
team/oej/pinefrog-rtcp-1.8/apps/app_getcpeid.c
team/oej/pinefrog-rtcp-1.8/apps/app_minivm.c
team/oej/pinefrog-rtcp-1.8/apps/app_queue.c
team/oej/pinefrog-rtcp-1.8/apps/app_sms.c
team/oej/pinefrog-rtcp-1.8/apps/app_stack.c
team/oej/pinefrog-rtcp-1.8/apps/app_voicemail.c
team/oej/pinefrog-rtcp-1.8/cdr/cdr_adaptive_odbc.c
team/oej/pinefrog-rtcp-1.8/cel/cel_odbc.c
team/oej/pinefrog-rtcp-1.8/cel/cel_pgsql.c
team/oej/pinefrog-rtcp-1.8/channels/chan_alsa.c
team/oej/pinefrog-rtcp-1.8/channels/chan_dahdi.c
team/oej/pinefrog-rtcp-1.8/channels/chan_gtalk.c
team/oej/pinefrog-rtcp-1.8/channels/chan_iax2.c
team/oej/pinefrog-rtcp-1.8/channels/chan_jingle.c
team/oej/pinefrog-rtcp-1.8/channels/chan_local.c
team/oej/pinefrog-rtcp-1.8/channels/chan_mgcp.c
team/oej/pinefrog-rtcp-1.8/channels/chan_phone.c
team/oej/pinefrog-rtcp-1.8/channels/chan_sip.c
team/oej/pinefrog-rtcp-1.8/channels/chan_skinny.c
team/oej/pinefrog-rtcp-1.8/channels/chan_unistim.c
team/oej/pinefrog-rtcp-1.8/channels/iax2-parser.c
team/oej/pinefrog-rtcp-1.8/channels/sig_analog.c
team/oej/pinefrog-rtcp-1.8/channels/sig_pri.c
team/oej/pinefrog-rtcp-1.8/channels/sip/config_parser.c
team/oej/pinefrog-rtcp-1.8/channels/sip/include/sip.h
team/oej/pinefrog-rtcp-1.8/formats/format_pcm.c
team/oej/pinefrog-rtcp-1.8/funcs/func_enum.c
team/oej/pinefrog-rtcp-1.8/funcs/func_env.c
team/oej/pinefrog-rtcp-1.8/funcs/func_iconv.c
team/oej/pinefrog-rtcp-1.8/funcs/func_srv.c
team/oej/pinefrog-rtcp-1.8/funcs/func_sysinfo.c
team/oej/pinefrog-rtcp-1.8/include/asterisk/astobj.h
team/oej/pinefrog-rtcp-1.8/main/abstract_jb.c
team/oej/pinefrog-rtcp-1.8/main/adsi.c
team/oej/pinefrog-rtcp-1.8/main/aoc.c
team/oej/pinefrog-rtcp-1.8/main/app.c
team/oej/pinefrog-rtcp-1.8/main/asterisk.c
team/oej/pinefrog-rtcp-1.8/main/audiohook.c
team/oej/pinefrog-rtcp-1.8/main/bridging.c
team/oej/pinefrog-rtcp-1.8/main/callerid.c
team/oej/pinefrog-rtcp-1.8/main/ccss.c
team/oej/pinefrog-rtcp-1.8/main/cel.c
team/oej/pinefrog-rtcp-1.8/main/channel.c
team/oej/pinefrog-rtcp-1.8/main/cli.c
team/oej/pinefrog-rtcp-1.8/main/config.c
team/oej/pinefrog-rtcp-1.8/main/data.c
team/oej/pinefrog-rtcp-1.8/main/devicestate.c
team/oej/pinefrog-rtcp-1.8/main/dsp.c
team/oej/pinefrog-rtcp-1.8/main/enum.c
team/oej/pinefrog-rtcp-1.8/main/event.c
team/oej/pinefrog-rtcp-1.8/main/features.c
team/oej/pinefrog-rtcp-1.8/main/file.c
team/oej/pinefrog-rtcp-1.8/main/frame.c
team/oej/pinefrog-rtcp-1.8/main/io.c
team/oej/pinefrog-rtcp-1.8/main/loader.c
team/oej/pinefrog-rtcp-1.8/main/logger.c
team/oej/pinefrog-rtcp-1.8/main/manager.c
team/oej/pinefrog-rtcp-1.8/main/netsock.c
team/oej/pinefrog-rtcp-1.8/main/pbx.c
team/oej/pinefrog-rtcp-1.8/main/rtp_engine.c
team/oej/pinefrog-rtcp-1.8/main/sched.c
team/oej/pinefrog-rtcp-1.8/main/security_events.c
team/oej/pinefrog-rtcp-1.8/main/stdtime/localtime.c
team/oej/pinefrog-rtcp-1.8/main/stun.c
team/oej/pinefrog-rtcp-1.8/main/taskprocessor.c
team/oej/pinefrog-rtcp-1.8/main/translate.c
team/oej/pinefrog-rtcp-1.8/main/udptl.c
team/oej/pinefrog-rtcp-1.8/main/utils.c
team/oej/pinefrog-rtcp-1.8/main/xmldoc.c
team/oej/pinefrog-rtcp-1.8/pbx/dundi-parser.c
team/oej/pinefrog-rtcp-1.8/pbx/pbx_config.c
team/oej/pinefrog-rtcp-1.8/pbx/pbx_dundi.c
team/oej/pinefrog-rtcp-1.8/res/ael/pval.c
team/oej/pinefrog-rtcp-1.8/res/res_agi.c
team/oej/pinefrog-rtcp-1.8/res/res_calendar.c
team/oej/pinefrog-rtcp-1.8/res/res_calendar_caldav.c
team/oej/pinefrog-rtcp-1.8/res/res_calendar_ews.c
team/oej/pinefrog-rtcp-1.8/res/res_calendar_exchange.c
team/oej/pinefrog-rtcp-1.8/res/res_calendar_icalendar.c
team/oej/pinefrog-rtcp-1.8/res/res_config_odbc.c
team/oej/pinefrog-rtcp-1.8/res/res_crypto.c
team/oej/pinefrog-rtcp-1.8/res/res_fax.c
team/oej/pinefrog-rtcp-1.8/res/res_fax_spandsp.c
team/oej/pinefrog-rtcp-1.8/res/res_jabber.c
team/oej/pinefrog-rtcp-1.8/res/res_monitor.c
team/oej/pinefrog-rtcp-1.8/res/res_musiconhold.c
team/oej/pinefrog-rtcp-1.8/res/res_odbc.c
team/oej/pinefrog-rtcp-1.8/res/res_pktccops.c
team/oej/pinefrog-rtcp-1.8/res/res_rtp_asterisk.c
team/oej/pinefrog-rtcp-1.8/res/res_srtp.c
team/oej/pinefrog-rtcp-1.8/res/res_timing_dahdi.c
Propchange: team/oej/pinefrog-rtcp-1.8/
------------------------------------------------------------------------------
automerge = Is-there-life-off-net?
Propchange: team/oej/pinefrog-rtcp-1.8/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon May 12 07:10:04 2014
@@ -1,1 +1,1 @@
-/branches/1.8:1-413524
+/branches/1.8:1-413694
Modified: team/oej/pinefrog-rtcp-1.8/apps/app_adsiprog.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/apps/app_adsiprog.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/apps/app_adsiprog.c (original)
+++ team/oej/pinefrog-rtcp-1.8/apps/app_adsiprog.c Mon May 12 07:10:04 2014
@@ -202,7 +202,7 @@
if (!(argtype & ARG_NUMBER))
return -1;
/* Octal value */
- if (sscanf(src, "%30o", (int *)out) != 1)
+ if (sscanf(src, "%30o", (unsigned *)out) != 1)
return -1;
if (argtype & ARG_STRING) {
/* Convert */
Modified: team/oej/pinefrog-rtcp-1.8/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/apps/app_dial.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/apps/app_dial.c (original)
+++ team/oej/pinefrog-rtcp-1.8/apps/app_dial.c Mon May 12 07:10:04 2014
@@ -1470,7 +1470,7 @@
/* Fall through */
case AST_FRAME_TEXT:
if (single && ast_write(in, f)) {
- ast_log(LOG_WARNING, "Unable to write frametype: %d\n",
+ ast_log(LOG_WARNING, "Unable to write frametype: %u\n",
f->frametype);
}
break;
@@ -1575,7 +1575,7 @@
case AST_FRAME_DTMF_BEGIN:
case AST_FRAME_DTMF_END:
if (ast_write(o->chan, f)) {
- ast_log(LOG_WARNING, "Unable to forward frametype: %d\n",
+ ast_log(LOG_WARNING, "Unable to forward frametype: %u\n",
f->frametype);
}
break;
Modified: team/oej/pinefrog-rtcp-1.8/apps/app_dumpchan.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/apps/app_dumpchan.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/apps/app_dumpchan.c (original)
+++ team/oej/pinefrog-rtcp-1.8/apps/app_dumpchan.c Mon May 12 07:10:04 2014
@@ -107,7 +107,7 @@
"RDNIS= %s\n"
"Parkinglot= %s\n"
"Language= %s\n"
- "State= %s (%d)\n"
+ "State= %s (%u)\n"
"Rings= %d\n"
"NativeFormat= %s\n"
"WriteFormat= %s\n"
@@ -117,8 +117,8 @@
"WriteTranscode= %s %s\n"
"ReadTranscode= %s %s\n"
"1stFileDescriptor= %d\n"
- "Framesin= %d %s\n"
- "Framesout= %d %s\n"
+ "Framesin= %u %s\n"
+ "Framesout= %u %s\n"
"TimetoHangup= %ld\n"
"ElapsedTime= %dh%dm%ds\n"
"DirectBridge= %s\n"
Modified: team/oej/pinefrog-rtcp-1.8/apps/app_festival.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/apps/app_festival.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/apps/app_festival.c (original)
+++ team/oej/pinefrog-rtcp-1.8/apps/app_festival.c Mon May 12 07:10:04 2014
@@ -414,7 +414,7 @@
/* Convert to HEX and look if there is any matching file in the cache
directory */
for (i = 0; i < 16; i++) {
- snprintf(koko, sizeof(koko), "%X", MD5Res[i]);
+ snprintf(koko, sizeof(koko), "%X", (unsigned)MD5Res[i]);
strncat(MD5Hex, koko, sizeof(MD5Hex) - strlen(MD5Hex) - 1);
}
readcache = 0;
Modified: team/oej/pinefrog-rtcp-1.8/apps/app_getcpeid.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/apps/app_getcpeid.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/apps/app_getcpeid.c (original)
+++ team/oej/pinefrog-rtcp-1.8/apps/app_getcpeid.c Mon May 12 07:10:04 2014
@@ -87,7 +87,9 @@
res = ast_adsi_get_cpeid(chan, cpeid, 0);
if (res > 0) {
gotcpeid = 1;
- ast_verb(3, "Got CPEID of '%02x:%02x:%02x:%02x' on '%s'\n", cpeid[0], cpeid[1], cpeid[2], cpeid[3], chan->name);
+ ast_verb(3, "Got CPEID of '%02x:%02x:%02x:%02x' on '%s'\n",
+ (unsigned)cpeid[0], (unsigned)cpeid[1], (unsigned)cpeid[2],
+ (unsigned)cpeid[3], chan->name);
}
if (res > -1) {
strcpy(data[1], "Measuring CPE...");
@@ -101,7 +103,9 @@
}
if (res > -1) {
if (gotcpeid)
- snprintf(data[1], 80, "CPEID: %02x:%02x:%02x:%02x", cpeid[0], cpeid[1], cpeid[2], cpeid[3]);
+ snprintf(data[1], 80, "CPEID: %02x:%02x:%02x:%02x",
+ (unsigned)cpeid[0], (unsigned)cpeid[1],
+ (unsigned)cpeid[2], (unsigned)cpeid[3]);
else
strcpy(data[1], "CPEID Unknown");
if (gotgeometry)
Modified: team/oej/pinefrog-rtcp-1.8/apps/app_minivm.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/apps/app_minivm.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/apps/app_minivm.c (original)
+++ team/oej/pinefrog-rtcp-1.8/apps/app_minivm.c Mon May 12 07:10:04 2014
@@ -1390,7 +1390,7 @@
}
}
- fprintf(p, "Message-ID: <Asterisk-%d-%s-%d-%s>\n", (unsigned int)ast_random(), vmu->username, (int)getpid(), who);
+ fprintf(p, "Message-ID: <Asterisk-%u-%s-%d-%s>\n", (unsigned int)ast_random(), vmu->username, (int)getpid(), who);
if (ast_strlen_zero(vmu->email)) {
snprintf(email, sizeof(email), "%s@%s", vmu->username, vmu->domain);
@@ -1441,7 +1441,7 @@
fprintf(p, "MIME-Version: 1.0\n");
/* Something unique. */
- snprintf(bound, sizeof(bound), "voicemail_%s%d%d", vmu->username, (int)getpid(), (unsigned int)ast_random());
+ snprintf(bound, sizeof(bound), "voicemail_%s%d%u", vmu->username, (int)getpid(), (unsigned int)ast_random());
fprintf(p, "Content-Type: multipart/mixed; boundary=\"%s\"\n\n\n", bound);
Modified: team/oej/pinefrog-rtcp-1.8/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/apps/app_queue.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/apps/app_queue.c (original)
+++ team/oej/pinefrog-rtcp-1.8/apps/app_queue.c Mon May 12 07:10:04 2014
@@ -5133,7 +5133,7 @@
ast_monitor_start(which, qe->parent->monfmt, qe->chan->cdr->uniqueid, 1, X_REC_IN | X_REC_OUT);
} else {
/* Last ditch effort -- no CDR, make up something */
- snprintf(tmpid, sizeof(tmpid), "chan-%lx", ast_random());
+ snprintf(tmpid, sizeof(tmpid), "chan-%lx", (unsigned long)ast_random());
ast_monitor_start(which, qe->parent->monfmt, tmpid, 1, X_REC_IN | X_REC_OUT);
}
if (!ast_strlen_zero(monexec)) {
@@ -5148,7 +5148,7 @@
if (qe->chan->cdr)
ast_copy_string(tmpid, qe->chan->cdr->uniqueid, sizeof(tmpid));
else
- snprintf(tmpid, sizeof(tmpid), "chan-%lx", ast_random());
+ snprintf(tmpid, sizeof(tmpid), "chan-%lx", (unsigned long)ast_random());
} else {
const char *m = monitorfilename;
for (p = tmpid2; p < tmpid2 + sizeof(tmpid2) - 1; p++, m++) {
Modified: team/oej/pinefrog-rtcp-1.8/apps/app_sms.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/apps/app_sms.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/apps/app_sms.c (original)
+++ team/oej/pinefrog-rtcp-1.8/apps/app_sms.c Mon May 12 07:10:04 2014
@@ -782,7 +782,7 @@
unsigned char n;
if (h->mr >= 0) {
- snprintf(mrs, sizeof(mrs), "%02X", h->mr);
+ snprintf(mrs, sizeof(mrs), "%02X", (unsigned)h->mr);
}
snprintf(line, sizeof(line), "%s %c%c%c%s %s %s %s ",
isodate(time(NULL), buf, sizeof(buf)),
@@ -999,7 +999,7 @@
snprintf(fn, sizeof(fn), "%s/sms/%s", ast_config_AST_SPOOL_DIR, h->smsc ? h->rx ? "morx" : "mttx" : h->rx ? "mtrx" : "motx");
ast_mkdir(fn, 0777); /* ensure it exists */
ast_copy_string(fn2, fn, sizeof(fn2));
- snprintf(fn2 + strlen(fn2), sizeof(fn2) - strlen(fn2), "/%s.%s-%d", h->queue, isodate(h->scts.tv_sec, buf, sizeof(buf)), seq++);
+ snprintf(fn2 + strlen(fn2), sizeof(fn2) - strlen(fn2), "/%s.%s-%u", h->queue, isodate(h->scts.tv_sec, buf, sizeof(buf)), seq++);
snprintf(fn + strlen(fn), sizeof(fn) - strlen(fn), "/.%s", fn2 + strlen(fn) + 1);
if ((o = fopen(fn, "w")) == NULL) {
return;
@@ -1015,7 +1015,7 @@
unsigned int p;
fprintf(o, "udh#");
for (p = 0; p < h->udhl; p++) {
- fprintf(o, "%02X", h->udh[p]);
+ fprintf(o, "%02X", (unsigned)h->udh[p]);
}
fprintf(o, "\n");
}
@@ -1048,13 +1048,13 @@
if (p == h->udl) { /* can write in ucs-1 hex */
fprintf(o, "ud#");
for (p = 0; p < h->udl; p++) {
- fprintf(o, "%02X", h->ud[p]);
+ fprintf(o, "%02X", (unsigned)h->ud[p]);
}
fprintf(o, "\n");
} else { /* write in UCS-2 */
fprintf(o, "ud##");
for (p = 0; p < h->udl; p++) {
- fprintf(o, "%04X", h->ud[p]);
+ fprintf(o, "%04X", (unsigned)h->ud[p]);
}
fprintf(o, "\n");
}
@@ -1071,7 +1071,7 @@
fprintf(o, "dcs=%d\n", h->dcs);
}
if (h->vp) {
- fprintf(o, "vp=%d\n", h->vp);
+ fprintf(o, "vp=%u\n", h->vp);
}
if (h->srr) {
fprintf(o, "srr=1\n");
@@ -1139,7 +1139,7 @@
return 0xFF; /* duh! */
}
} else {
- ast_log(LOG_WARNING, "Unknown message type %02X\n", h->imsg[2]);
+ ast_log(LOG_WARNING, "Unknown message type %02X\n", (unsigned)h->imsg[2]);
return 0xFF;
}
} else { /* client */
@@ -1162,7 +1162,7 @@
return 0xFF; /* duh! */
}
} else {
- ast_log(LOG_WARNING, "Unknown message type %02X\n", h->imsg[2]);
+ ast_log(LOG_WARNING, "Unknown message type %02X\n", (unsigned)h->imsg[2]);
return 0xFF;
}
}
@@ -1244,7 +1244,7 @@
int f;
for (p = s, f = 0; f < size && f < MAX_DEBUG_LEN; f++, p += 3) {
- sprintf(p, "%02X ", (unsigned char)buf[f]);
+ sprintf(p, "%02X ", (unsigned)buf[f]);
}
return(s);
}
@@ -1270,7 +1270,7 @@
msgsz += (h->imsg[f++] * 256);
switch (msg) {
case 0x13: /* Body */
- ast_verb(3, "SMS-P2 Body#%02X=[%.*s]\n", msg, msgsz, &h->imsg[f]);
+ ast_verb(3, "SMS-P2 Body#%02X=[%.*s]\n", (unsigned)msg, msgsz, &h->imsg[f]);
if (msgsz >= sizeof(h->ud)) {
msgsz = sizeof(h->ud) - 1;
}
@@ -1288,27 +1288,27 @@
tm.tm_min = ( (h->imsg[f + 6] * 10) + h->imsg[f + 7] );
tm.tm_sec = 0;
h->scts = ast_mktime(&tm, NULL);
- ast_verb(3, "SMS-P2 Date#%02X=%02d/%02d %02d:%02d\n", msg, tm.tm_mday, tm.tm_mon + 1, tm.tm_hour, tm.tm_min);
+ ast_verb(3, "SMS-P2 Date#%02X=%02d/%02d %02d:%02d\n", (unsigned)msg, tm.tm_mday, tm.tm_mon + 1, tm.tm_hour, tm.tm_min);
break;
case 0x15: /* Calling line (from SMSC) */
if (msgsz >= 20) {
msgsz = 20 - 1;
}
- ast_verb(3, "SMS-P2 Origin#%02X=[%.*s]\n", msg, msgsz, &h->imsg[f]);
+ ast_verb(3, "SMS-P2 Origin#%02X=[%.*s]\n", (unsigned)msg, msgsz, &h->imsg[f]);
ast_copy_string(h->oa, (char *)(&h->imsg[f]), msgsz + 1);
break;
case 0x18: /* Destination(from TE/phone) */
if (msgsz >= 20) {
msgsz = 20 - 1;
}
- ast_verb(3, "SMS-P2 Destination#%02X=[%.*s]\n", msg, msgsz, &h->imsg[f]);
+ ast_verb(3, "SMS-P2 Destination#%02X=[%.*s]\n", (unsigned)msg, msgsz, &h->imsg[f]);
ast_copy_string(h->da, (char *)(&h->imsg[f]), msgsz + 1);
break;
case 0x1C: /* Notify */
- ast_verb(3, "SMS-P2 Notify#%02X=%s\n", msg, sms_hexdump(&h->imsg[f], 3, debug_buf));
+ ast_verb(3, "SMS-P2 Notify#%02X=%s\n", (unsigned)msg, sms_hexdump(&h->imsg[f], 3, debug_buf));
break;
default:
- ast_verb(3, "SMS-P2 Par#%02X [%d]: %s\n", msg, msgsz, sms_hexdump(&h->imsg[f], msgsz, debug_buf));
+ ast_verb(3, "SMS-P2 Par#%02X [%d]: %s\n", (unsigned)msg, msgsz, sms_hexdump(&h->imsg[f], msgsz, debug_buf));
break;
}
f+=msgsz; /* Skip to next */
@@ -1482,7 +1482,7 @@
int n = (dir == DIR_RX) ? h->ibytep : msg[1] + 2;
int q = 0;
while (q < n && q < 30) {
- sprintf(p, " %02X", msg[q++]);
+ sprintf(p, " %02X", (unsigned)msg[q++]);
p += 3;
}
if (q < n) {
@@ -1892,7 +1892,7 @@
ast_app_parse_options(sms_options, &flags, sms_opts, sms_args.options);
}
- ast_verb(1, "sms argc %d queue <%s> opts <%s> addr <%s> body <%s>\n",
+ ast_verb(1, "sms argc %u queue <%s> opts <%s> addr <%s> body <%s>\n",
sms_args.argc, S_OR(sms_args.queue, ""),
S_OR(sms_args.options, ""),
S_OR(sms_args.addr, ""),
Modified: team/oej/pinefrog-rtcp-1.8/apps/app_stack.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/apps/app_stack.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/apps/app_stack.c (original)
+++ team/oej/pinefrog-rtcp-1.8/apps/app_stack.c Mon May 12 07:10:04 2014
@@ -502,7 +502,7 @@
frame_set_var(chan, newframe, argname, i < args2.argc ? args2.argval[i] : "");
ast_debug(1, "Setting '%s' to '%s'\n", argname, i < args2.argc ? args2.argval[i] : "");
}
- snprintf(argname, sizeof(argname), "%d", args2.argc);
+ snprintf(argname, sizeof(argname), "%u", args2.argc);
frame_set_var(chan, newframe, "ARGC", argname);
/* And finally, save our return address */
Modified: team/oej/pinefrog-rtcp-1.8/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/apps/app_voicemail.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/apps/app_voicemail.c (original)
+++ team/oej/pinefrog-rtcp-1.8/apps/app_voicemail.c Mon May 12 07:10:04 2014
@@ -4680,7 +4680,7 @@
}
}
- fprintf(p, "Message-ID: <Asterisk-%d-%d-%s-%d@%s>" ENDL, msgnum + 1,
+ fprintf(p, "Message-ID: <Asterisk-%d-%u-%s-%d@%s>" ENDL, msgnum + 1,
(unsigned int) ast_random(), mailbox, (int) getpid(), host);
if (imap) {
/* additional information needed for IMAP searching */
@@ -4718,7 +4718,7 @@
fprintf(p, "MIME-Version: 1.0" ENDL);
if (attach_user_voicemail) {
/* Something unique. */
- snprintf(bound, sizeof(bound), "----voicemail_%d%s%d%d", msgnum + 1, mailbox,
+ snprintf(bound, sizeof(bound), "----voicemail_%d%s%d%u", msgnum + 1, mailbox,
(int) getpid(), (unsigned int) ast_random());
fprintf(p, "Content-Type: multipart/mixed; boundary=\"%s\"" ENDL, bound);
@@ -4893,7 +4893,7 @@
if (!strcmp(format, "wav49"))
format = "WAV";
- ast_debug(3, "Attaching file '%s', format '%s', uservm is '%d', global is %d\n", attach, format, attach_user_voicemail, ast_test_flag((&globalflags), VM_ATTACH));
+ ast_debug(3, "Attaching file '%s', format '%s', uservm is '%d', global is %u\n", attach, format, attach_user_voicemail, ast_test_flag((&globalflags), VM_ATTACH));
/* Make a temporary file instead of piping directly to sendmail, in case the mail
command hangs */
if ((p = vm_mkftemp(tmp)) == NULL) {
@@ -11909,7 +11909,7 @@
const char *val;
char *q, *stringp, *tmp;
int x;
- int tmpadsi[4];
+ unsigned int tmpadsi[4];
char secretfn[PATH_MAX] = "";
#ifdef IMAP_STORAGE
Modified: team/oej/pinefrog-rtcp-1.8/cdr/cdr_adaptive_odbc.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/cdr/cdr_adaptive_odbc.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/cdr/cdr_adaptive_odbc.c (original)
+++ team/oej/pinefrog-rtcp-1.8/cdr/cdr_adaptive_odbc.c Mon May 12 07:10:04 2014
@@ -583,7 +583,7 @@
if (ast_strlen_zero(colptr)) {
continue;
} else {
- char integer = 0;
+ signed char integer = 0;
if (sscanf(colptr, "%30hhd", &integer) != 1) {
ast_log(LOG_WARNING, "CDR variable %s is not an integer.\n", entry->name);
continue;
@@ -598,7 +598,7 @@
if (ast_strlen_zero(colptr)) {
continue;
} else {
- char integer = 0;
+ signed char integer = 0;
if (sscanf(colptr, "%30hhd", &integer) != 1) {
ast_log(LOG_WARNING, "CDR variable %s is not an integer.\n", entry->name);
continue;
Modified: team/oej/pinefrog-rtcp-1.8/cel/cel_odbc.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/cel/cel_odbc.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/cel/cel_odbc.c (original)
+++ team/oej/pinefrog-rtcp-1.8/cel/cel_odbc.c Mon May 12 07:10:04 2014
@@ -437,7 +437,7 @@
} else if (strcmp(entry->celname, "peer") == 0) {
ast_copy_string(colbuf, record.peer, sizeof(colbuf));
} else if (strcmp(entry->celname, "amaflags") == 0) {
- snprintf(colbuf, sizeof(colbuf), "%d", record.amaflag);
+ snprintf(colbuf, sizeof(colbuf), "%u", record.amaflag);
} else if (strcmp(entry->celname, "extra") == 0) {
ast_copy_string(colbuf, record.extra, sizeof(colbuf));
} else {
@@ -631,7 +631,7 @@
break;
case SQL_TINYINT:
{
- char integer = 0;
+ signed char integer = 0;
if (strcasecmp(entry->name, "eventtype") == 0) {
integer = (char) record.event_type;
} else if (ast_strlen_zero(colptr)) {
@@ -648,7 +648,7 @@
break;
case SQL_BIT:
{
- char integer = 0;
+ signed char integer = 0;
if (strcasecmp(entry->name, "eventtype") == 0) {
integer = (char) record.event_type;
} else if (ast_strlen_zero(colptr)) {
Modified: team/oej/pinefrog-rtcp-1.8/cel/cel_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/cel/cel_pgsql.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/cel/cel_pgsql.c (original)
+++ team/oej/pinefrog-rtcp-1.8/cel/cel_pgsql.c Mon May 12 07:10:04 2014
@@ -192,11 +192,11 @@
if (strncmp(cur->type, "int", 3) == 0) {
/* Integer, no need to escape anything */
LENGTHEN_BUF2(13);
- ast_str_append(&sql2, 0, "%s%d", SEP, record.amaflag);
+ ast_str_append(&sql2, 0, "%s%u", SEP, record.amaflag);
} else {
/* Although this is a char field, there are no special characters in the values for these fields */
LENGTHEN_BUF2(31);
- ast_str_append(&sql2, 0, "%s'%d'", SEP, record.amaflag);
+ ast_str_append(&sql2, 0, "%s'%u'", SEP, record.amaflag);
}
} else {
/* Arbitrary field, could be anything */
Modified: team/oej/pinefrog-rtcp-1.8/channels/chan_alsa.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/channels/chan_alsa.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/channels/chan_alsa.c (original)
+++ team/oej/pinefrog-rtcp-1.8/channels/chan_alsa.c Mon May 12 07:10:04 2014
@@ -202,12 +202,12 @@
direction = 0;
err = snd_pcm_hw_params_set_rate_near(handle, hwparams, &rate, &direction);
if (rate != DESIRED_RATE)
- ast_log(LOG_WARNING, "Rate not correct, requested %d, got %d\n", DESIRED_RATE, rate);
+ ast_log(LOG_WARNING, "Rate not correct, requested %d, got %u\n", DESIRED_RATE, rate);
direction = 0;
err = snd_pcm_hw_params_set_period_size_near(handle, hwparams, &period_size, &direction);
if (err < 0)
- ast_log(LOG_ERROR, "period_size(%ld frames) is bad: %s\n", period_size, snd_strerror(err));
+ ast_log(LOG_ERROR, "period_size(%lu frames) is bad: %s\n", period_size, snd_strerror(err));
else {
ast_debug(1, "Period size is %d\n", err);
}
@@ -215,7 +215,7 @@
buffer_size = 4096 * 2; /* period_size * 16; */
err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &buffer_size);
if (err < 0)
- ast_log(LOG_WARNING, "Problem setting buffer size of %ld: %s\n", buffer_size, snd_strerror(err));
+ ast_log(LOG_WARNING, "Problem setting buffer size of %lu: %s\n", buffer_size, snd_strerror(err));
else {
ast_debug(1, "Buffer size is set to %d frames\n", err);
}
Modified: team/oej/pinefrog-rtcp-1.8/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/channels/chan_dahdi.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/channels/chan_dahdi.c (original)
+++ team/oej/pinefrog-rtcp-1.8/channels/chan_dahdi.c Mon May 12 07:10:04 2014
@@ -2069,7 +2069,7 @@
ast_debug(1, "%s DTMF digit: 0x%02X '%c' on %s\n",
f->frametype == AST_FRAME_DTMF_BEGIN ? "Begin" : "End",
- f->subclass.integer, f->subclass.integer, ast->name);
+ (unsigned)f->subclass.integer, f->subclass.integer, ast->name);
if (f->subclass.integer == 'f') {
if (f->frametype == AST_FRAME_DTMF_END) {
@@ -3031,7 +3031,7 @@
}
if (sub != ANALOG_SUB_REAL) {
- ast_log(LOG_ERROR, "Trying to dial_digits '%s' on channel %d subchannel %d\n",
+ ast_log(LOG_ERROR, "Trying to dial_digits '%s' on channel %d subchannel %u\n",
dop->dialstr, p->channel, sub);
return -1;
}
@@ -7773,7 +7773,7 @@
ast_debug(1, "%s DTMF digit: 0x%02X '%c' on %s\n",
f->frametype == AST_FRAME_DTMF_BEGIN ? "Begin" : "End",
- f->subclass.integer, f->subclass.integer, ast->name);
+ (unsigned)f->subclass.integer, f->subclass.integer, ast->name);
if (p->confirmanswer) {
if (f->frametype == AST_FRAME_DTMF_END) {
@@ -8188,7 +8188,7 @@
return NULL;
}
mssinceflash = ast_tvdiff_ms(ast_tvnow(), p->flashtime);
- ast_debug(1, "Last flash was %d ms ago\n", mssinceflash);
+ ast_debug(1, "Last flash was %u ms ago\n", mssinceflash);
if (mssinceflash < MIN_MS_SINCE_FLASH) {
/* It hasn't been long enough since the last flashook. This is probably a bounce on
hanging up. Hangup both channels now */
@@ -8360,7 +8360,7 @@
res = tone_zone_play_tone(p->subs[SUB_REAL].dfd, DAHDI_TONE_DIALTONE);
break;
default:
- ast_log(LOG_WARNING, "FXO phone off hook in weird state %d??\n", ast->_state);
+ ast_log(LOG_WARNING, "FXO phone off hook in weird state %u??\n", ast->_state);
}
break;
case SIG_FXSLS:
@@ -8410,7 +8410,7 @@
ast_setstate(ast, AST_STATE_UP);
}
} else if (ast->_state != AST_STATE_RING)
- ast_log(LOG_WARNING, "Ring/Off-hook in strange state %d on channel %d\n", ast->_state, p->channel);
+ ast_log(LOG_WARNING, "Ring/Off-hook in strange state %u on channel %d\n", ast->_state, p->channel);
break;
default:
ast_log(LOG_WARNING, "Don't know how to handle ring/off hook for signalling %d\n", p->sig);
@@ -8659,7 +8659,7 @@
if (p->dialing)
ast_debug(1, "Ignoring wink on channel %d\n", p->channel);
else
- ast_debug(1, "Got wink in weird state %d on channel %d\n", ast->_state, p->channel);
+ ast_debug(1, "Got wink in weird state %u on channel %d\n", ast->_state, p->channel);
break;
case SIG_FEATDMF_TA:
switch (p->whichwink) {
@@ -8764,7 +8764,7 @@
p->polaritydelaytv = ast_tvnow();
}
} else
- ast_debug(1, "Ignore switch to REVERSED Polarity on channel %d, state %d\n", p->channel, ast->_state);
+ ast_debug(1, "Ignore switch to REVERSED Polarity on channel %d, state %u\n", p->channel, ast->_state);
}
/* Removed else statement from here as it was preventing hangups from ever happening*/
/* Added AST_STATE_RING in if statement below to deal with calling party hangups that take place when ringing */
@@ -8773,21 +8773,21 @@
(p->polarity == POLARITY_REV) &&
((ast->_state == AST_STATE_UP) || (ast->_state == AST_STATE_RING)) ) {
/* Added log_debug information below to provide a better indication of what is going on */
- ast_debug(1, "Polarity Reversal event occured - DEBUG 1: channel %d, state %d, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %" PRIi64 "\n", p->channel, ast->_state, p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) );
+ ast_debug(1, "Polarity Reversal event occured - DEBUG 1: channel %d, state %u, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %" PRIi64 "\n", p->channel, ast->_state, p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) );
if (ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) > p->polarityonanswerdelay) {
ast_debug(1, "Polarity Reversal detected and now Hanging up on channel %d\n", p->channel);
ast_softhangup(p->owner, AST_SOFTHANGUP_EXPLICIT);
p->polarity = POLARITY_IDLE;
} else
- ast_debug(1, "Polarity Reversal detected but NOT hanging up (too close to answer event) on channel %d, state %d\n", p->channel, ast->_state);
+ ast_debug(1, "Polarity Reversal detected but NOT hanging up (too close to answer event) on channel %d, state %u\n", p->channel, ast->_state);
} else {
p->polarity = POLARITY_IDLE;
- ast_debug(1, "Ignoring Polarity switch to IDLE on channel %d, state %d\n", p->channel, ast->_state);
+ ast_debug(1, "Ignoring Polarity switch to IDLE on channel %d, state %u\n", p->channel, ast->_state);
}
/* Added more log_debug information below to provide a better indication of what is going on */
- ast_debug(1, "Polarity Reversal event occured - DEBUG 2: channel %d, state %d, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %" PRIi64 "\n", p->channel, ast->_state, p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) );
+ ast_debug(1, "Polarity Reversal event occured - DEBUG 2: channel %d, state %u, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %" PRIi64 "\n", p->channel, ast->_state, p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) );
break;
default:
ast_debug(1, "Dunno what to do with event %d on channel %d\n", res, p->channel);
@@ -9292,7 +9292,7 @@
/* Don't accept in-band DTMF when in overlap dial mode */
ast_debug(1, "Absorbing inband %s DTMF digit: 0x%02X '%c' on %s\n",
f->frametype == AST_FRAME_DTMF_BEGIN ? "begin" : "end",
- f->subclass.integer, f->subclass.integer, ast->name);
+ (unsigned)f->subclass.integer, f->subclass.integer, ast->name);
f->frametype = AST_FRAME_NULL;
f->subclass.integer = 0;
@@ -9404,7 +9404,7 @@
/* Write a frame of (presumably voice) data */
if (frame->frametype != AST_FRAME_VOICE) {
if (frame->frametype != AST_FRAME_IMAGE)
- ast_log(LOG_WARNING, "Don't know what to do with frame type '%d'\n", frame->frametype);
+ ast_log(LOG_WARNING, "Don't know what to do with frame type '%u'\n", frame->frametype);
return 0;
}
if ((frame->subclass.codec != AST_FORMAT_SLINEAR) &&
@@ -9596,15 +9596,15 @@
ast_mutex_lock(&i->pri->lock);
y = ++i->pri->new_chan_seq;
if (is_outgoing) {
- ast_str_set(&chan_name, 0, "i%d/%s-%x", i->pri->span, address, y);
+ ast_str_set(&chan_name, 0, "i%d/%s-%x", i->pri->span, address, (unsigned)y);
address[0] = '\0';
} else if (ast_strlen_zero(i->cid_subaddr)) {
/* Put in caller-id number only since there is no subaddress. */
- ast_str_set(&chan_name, 0, "i%d/%s-%x", i->pri->span, i->cid_num, y);
+ ast_str_set(&chan_name, 0, "i%d/%s-%x", i->pri->span, i->cid_num, (unsigned)y);
} else {
/* Put in caller-id number and subaddress. */
ast_str_set(&chan_name, 0, "i%d/%s:%s-%x", i->pri->span, i->cid_num,
- i->cid_subaddr, y);
+ i->cid_subaddr, (unsigned)y);
}
ast_mutex_unlock(&i->pri->lock);
#endif /* defined(HAVE_PRI) */
@@ -15528,9 +15528,9 @@
ast_cli(a->fd, "Echo Cancellation:\n");
if (tmp->echocancel.head.tap_length) {
- ast_cli(a->fd, "\t%d taps\n", tmp->echocancel.head.tap_length);
+ ast_cli(a->fd, "\t%u taps\n", tmp->echocancel.head.tap_length);
for (x = 0; x < tmp->echocancel.head.param_count; x++) {
- ast_cli(a->fd, "\t\t%s: %ud\n", tmp->echocancel.params[x].name, tmp->echocancel.params[x].value);
+ ast_cli(a->fd, "\t\t%s: %dd\n", tmp->echocancel.params[x].name, tmp->echocancel.params[x].value);
}
ast_cli(a->fd, "\t%scurrently %s\n", tmp->echocanbridged ? "" : "(unless TDM bridged) ", tmp->echocanon ? "ON" : "OFF");
} else {
@@ -15587,7 +15587,7 @@
ast_cli(a->fd, "PRI Flags: ");
if (chan->resetting != SIG_PRI_RESET_IDLE) {
- ast_cli(a->fd, "Resetting=%d ", chan->resetting);
+ ast_cli(a->fd, "Resetting=%u ", chan->resetting);
}
if (chan->call)
ast_cli(a->fd, "Call ");
@@ -15606,7 +15606,7 @@
if (tmp->subs[SUB_REAL].dfd > -1) {
memset(&ci, 0, sizeof(ci));
if (!ioctl(tmp->subs[SUB_REAL].dfd, DAHDI_GETCONF, &ci)) {
- ast_cli(a->fd, "Actual Confinfo: Num/%d, Mode/0x%04x\n", ci.confno, ci.confmode);
+ ast_cli(a->fd, "Actual Confinfo: Num/%d, Mode/0x%04x\n", ci.confno, (unsigned)ci.confmode);
}
if (!ioctl(tmp->subs[SUB_REAL].dfd, DAHDI_GETCONFMUTE, &x)) {
ast_cli(a->fd, "Actual Confmute: %s\n", x ? "Yes" : "No");
@@ -17064,12 +17064,12 @@
} param;
if (ast_app_separate_args(params[x], '=', (char **) ¶m, 2) < 1) {
- ast_log(LOG_WARNING, "Invalid echocancel parameter supplied at line %d: '%s'\n", line, params[x]);
+ ast_log(LOG_WARNING, "Invalid echocancel parameter supplied at line %u: '%s'\n", line, params[x]);
continue;
}
if (ast_strlen_zero(param.name) || (strlen(param.name) > sizeof(confp->chan.echocancel.params[0].name)-1)) {
- ast_log(LOG_WARNING, "Invalid echocancel parameter supplied at line %d: '%s'\n", line, param.name);
+ ast_log(LOG_WARNING, "Invalid echocancel parameter supplied at line %u: '%s'\n", line, param.name);
continue;
}
@@ -17077,7 +17077,7 @@
if (param.value) {
if (sscanf(param.value, "%30d", &confp->chan.echocancel.params[confp->chan.echocancel.head.param_count].value) != 1) {
- ast_log(LOG_WARNING, "Invalid echocancel parameter value supplied at line %d: '%s'\n", line, param.value);
+ ast_log(LOG_WARNING, "Invalid echocancel parameter value supplied at line %u: '%s'\n", line, param.value);
continue;
}
}
Modified: team/oej/pinefrog-rtcp-1.8/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/channels/chan_gtalk.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/channels/chan_gtalk.c (original)
+++ team/oej/pinefrog-rtcp-1.8/channels/chan_gtalk.c Mon May 12 07:10:04 2014
@@ -890,8 +890,8 @@
ast_copy_string(ours1->name, "rtp", sizeof(ours1->name));
ours1->port = ntohs(sin.sin_port);
ours1->preference = 1;
- snprintf(user, sizeof(user), "%08lx%08lx", ast_random(), ast_random());
- snprintf(pass, sizeof(pass), "%08lx%08lx", ast_random(), ast_random());
+ snprintf(user, sizeof(user), "%08lx%08lx", (long unsigned)ast_random(), (long unsigned)ast_random());
+ snprintf(pass, sizeof(pass), "%08lx%08lx", (long unsigned)ast_random(), (long unsigned)ast_random());
ast_copy_string(ours1->username, user, sizeof(ours1->username));
ast_copy_string(ours1->password, pass, sizeof(ours1->password));
ast_copy_string(ours1->ip, ast_sockaddr_stringify_addr(&us),
@@ -1026,7 +1026,7 @@
ast_copy_string(tmp->them, them, sizeof(tmp->them));
ast_copy_string(tmp->us, us, sizeof(tmp->us));
} else {
- snprintf(tmp->sid, sizeof(tmp->sid), "%08lx%08lx", ast_random(), ast_random());
+ snprintf(tmp->sid, sizeof(tmp->sid), "%08lx%08lx", (long unsigned)ast_random(), (long unsigned)ast_random());
ast_copy_string(tmp->them, idroster, sizeof(tmp->them));
ast_copy_string(tmp->us, us, sizeof(tmp->us));
tmp->initiator = 1;
@@ -1089,7 +1089,9 @@
n2 = title;
else
n2 = i->us;
- tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, linkedid, client->accountcode, i->exten, client->context, client->amaflags, "Gtalk/%s-%04lx", n2, ast_random() & 0xffff);
+ tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, linkedid,
+ client->accountcode, i->exten, client->context, client->amaflags,
+ "Gtalk/%s-%04lx", n2, (long unsigned)(ast_random() & 0xffff));
if (!tmp) {
ast_log(LOG_WARNING, "Unable to allocate Gtalk channel structure!\n");
return NULL;
@@ -1642,7 +1644,7 @@
return 0;
break;
default:
- ast_log(LOG_WARNING, "Can't send %d type frames with Gtalk write\n",
+ ast_log(LOG_WARNING, "Can't send %u type frames with Gtalk write\n",
frame->frametype);
return 0;
}
Modified: team/oej/pinefrog-rtcp-1.8/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-rtcp-1.8/channels/chan_iax2.c?view=diff&rev=413696&r1=413695&r2=413696
==============================================================================
--- team/oej/pinefrog-rtcp-1.8/channels/chan_iax2.c (original)
+++ team/oej/pinefrog-rtcp-1.8/channels/chan_iax2.c Mon May 12 07:10:04 2014
@@ -356,7 +356,7 @@
break; \
\
for (idx = 0; idx < 16; idx++) \
- sprintf(digest + (idx << 1), "%2.2x", (unsigned char) key[idx]); \
+ sprintf(digest + (idx << 1), "%2.2x", (unsigned) key[idx]); \
\
ast_log(LOG_NOTICE, msg " IAX_COMMAND_RTKEY to rotate key to '%s'\n", digest); \
} while(0)
@@ -2326,7 +2326,7 @@
user_unref(user);
}
- ast_debug(1, "Determining if address %s with username %s requires calltoken validation. Optional = %d calltoken_required = %d \n", ast_inet_ntoa(sin->sin_addr), name, optional, calltoken_required);
+ ast_debug(1, "Determining if address %s with username %s requires calltoken validation. Optional = %d calltoken_required = %u\n", ast_inet_ntoa(sin->sin_addr), name, optional, calltoken_required);
if (((calltoken_required == CALLTOKEN_NO) || (calltoken_required == CALLTOKEN_AUTO)) ||
(optional && (calltoken_required == CALLTOKEN_DEFAULT))) {
res = 0;
@@ -3125,7 +3125,7 @@
else
last = s;
- snprintf(s2, strlen(s) + 100, "/var/tmp/%s-%ld", last, (unsigned long)ast_random());
+ snprintf(s2, strlen(s) + 100, "/var/tmp/%s-%ld", last, ast_random());
if ((res = stat(s, &stbuf) < 0)) {
ast_log(LOG_WARNING, "Failed to stat '%s': %s\n", s, strerror(errno));
@@ -3426,7 +3426,7 @@
/* Called with iaxsl held */
if (iaxdebug)
- ast_debug(3, "Sending %d on %d/%d to %s:%d\n", f->ts, callno, iaxs[callno]->peercallno, ast_inet_ntoa(iaxs[callno]->addr.sin_addr), ntohs(iaxs[callno]->addr.sin_port));
[... 4289 lines stripped ...]
More information about the svn-commits
mailing list