]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Allow Asterisk to compile under GCC 4.10
authorKinsey Moore <kmoore@digium.com>
Fri, 9 May 2014 22:18:59 +0000 (22:18 +0000)
committerKinsey Moore <kmoore@digium.com>
Fri, 9 May 2014 22:18:59 +0000 (22:18 +0000)
This resolves a large number of compiler warnings from GCC 4.10 which
cause the build to fail under dev mode. The vast majority are
signed/unsigned mismatches in printf-style format strings.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@413586 65c4cc65-6c06-0410-ace0-fbb531ad65f3

95 files changed:
apps/app_adsiprog.c
apps/app_dial.c
apps/app_dumpchan.c
apps/app_festival.c
apps/app_getcpeid.c
apps/app_minivm.c
apps/app_queue.c
apps/app_sms.c
apps/app_stack.c
apps/app_voicemail.c
cdr/cdr_adaptive_odbc.c
cel/cel_odbc.c
cel/cel_pgsql.c
channels/chan_alsa.c
channels/chan_dahdi.c
channels/chan_gtalk.c
channels/chan_iax2.c
channels/chan_jingle.c
channels/chan_local.c
channels/chan_mgcp.c
channels/chan_phone.c
channels/chan_sip.c
channels/chan_skinny.c
channels/chan_unistim.c
channels/iax2-parser.c
channels/sig_analog.c
channels/sig_pri.c
channels/sip/config_parser.c
channels/sip/include/sip.h
formats/format_pcm.c
funcs/func_enum.c
funcs/func_env.c
funcs/func_iconv.c
funcs/func_srv.c
funcs/func_sysinfo.c
include/asterisk/astobj.h
main/abstract_jb.c
main/adsi.c
main/aoc.c
main/app.c
main/asterisk.c
main/audiohook.c
main/bridging.c
main/callerid.c
main/ccss.c
main/cel.c
main/channel.c
main/cli.c
main/config.c
main/data.c
main/devicestate.c
main/dsp.c
main/enum.c
main/event.c
main/features.c
main/file.c
main/frame.c
main/io.c
main/loader.c
main/logger.c
main/manager.c
main/netsock.c
main/pbx.c
main/rtp_engine.c
main/sched.c
main/security_events.c
main/stdtime/localtime.c
main/stun.c
main/taskprocessor.c
main/translate.c
main/udptl.c
main/utils.c
main/xmldoc.c
pbx/dundi-parser.c
pbx/pbx_config.c
pbx/pbx_dundi.c
res/ael/pval.c
res/res_agi.c
res/res_calendar.c
res/res_calendar_caldav.c
res/res_calendar_ews.c
res/res_calendar_exchange.c
res/res_calendar_icalendar.c
res/res_config_odbc.c
res/res_crypto.c
res/res_fax.c
res/res_fax_spandsp.c
res/res_jabber.c
res/res_monitor.c
res/res_musiconhold.c
res/res_odbc.c
res/res_pktccops.c
res/res_rtp_asterisk.c
res/res_srtp.c
res/res_timing_dahdi.c

index 430d8258d600222d81dbd964d1257d0a4e8e75b1..3f7b29c00c741708a4449c8030826be2dc5f4c1f 100644 (file)
@@ -202,7 +202,7 @@ static int process_token(void *out, char *src, int maxlen, int argtype)
                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 */
index dd41ec0857f9dc4f79493a51600e7330c8f59a87..226aaf468133efd5b23d954eb96f80719b196df6 100644 (file)
@@ -1470,7 +1470,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                /* 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 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                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;
index 30fd711310bc18f02f739d8085f655728b1fdd64..10bfd0e1428ea986a0956b7448dc0482ead405ba 100644 (file)
@@ -107,7 +107,7 @@ static int serialize_showchan(struct ast_channel *c, char *buf, size_t size)
                "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 @@ static int serialize_showchan(struct ast_channel *c, char *buf, size_t size)
                "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"
index ed9c3d1e4ce9dcaf9ee01a4ec621300fac95925b..8fe6a0bc7fd8ffc1033b9af859431bc31c1b64f4 100644 (file)
@@ -414,7 +414,7 @@ static int festival_exec(struct ast_channel *chan, const char *vdata)
        /* 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;
index 90bf45e7ee98c49fb6bbe2e8a4545972be509cb4..97d3e82dd52e09982a03b86feb70367faefd082b 100644 (file)
@@ -87,7 +87,9 @@ static int cpeid_exec(struct ast_channel *chan, const char *idata)
                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 @@ static int cpeid_exec(struct ast_channel *chan, const char *idata)
                }
                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) 
index 63b28496e9e37601940b3880a998654c8840bcb7..e8c5654e5fd6d240e0e57ec95b016bf1ae0ebbdb 100644 (file)
@@ -1390,7 +1390,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
                }
        } 
 
-       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 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
        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);
 
index 57ad425924d8f8f4d2333a809e47fc1e4c6f1a52..fbb33042175497661bde885499e3df8a4a206d02 100644 (file)
@@ -5133,7 +5133,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
                                        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 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
                                                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++) {
index 02d801d919712988579cda152653de970881db98..f1bf5660cb3236da6715d2a58f1294ca1ddb226b 100644 (file)
@@ -782,7 +782,7 @@ static void sms_log(sms_t * h, char status)
                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 @@ static void sms_writefile(sms_t * h)
        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 @@ static void sms_writefile(sms_t * h)
                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 @@ static void sms_writefile(sms_t * h)
                        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 @@ static void sms_writefile(sms_t * h)
                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 @@ static unsigned char sms_handleincoming (sms_t * h)
                                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 @@ static unsigned char sms_handleincoming (sms_t * h)
                                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 @@ static char *sms_hexdump(unsigned char buf[], int size, char *s /* destination *
        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 @@ static int sms_handleincoming_proto2(sms_t *h)
                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 @@ static int sms_handleincoming_proto2(sms_t *h)
                        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 @@ static void sms_debug (int dir, sms_t *h)
        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 @@ static int sms_exec(struct ast_channel *chan, const char *data)
                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, ""),
index 496ac4bbd33bba20f78525b1cafe3e668a3db283..5dc888a8f45074d0a930730bfddd56b667ca707c 100644 (file)
@@ -502,7 +502,7 @@ static int gosub_exec(struct ast_channel *chan, const char *data)
                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 */
index 9a98b80ce61b8d07ffc937bb4b2c465999aec05d..1c163feb66bed5d95b8f3d06b60251264d45c821 100644 (file)
@@ -4680,7 +4680,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
                }
        }
 
-       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 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
        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 @@ static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *c
 
        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 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con
        const char *val;
        char *q, *stringp, *tmp;
        int x;
-       int tmpadsi[4];
+       unsigned int tmpadsi[4];
        char secretfn[PATH_MAX] = "";
 
 #ifdef IMAP_STORAGE
index 5fa9f5416006907c43280d2dff3c50f95580d882..b612cc033f84d1592d23b68f5c0ecb771009995a 100644 (file)
@@ -583,7 +583,7 @@ static int odbc_log(struct ast_cdr *cdr)
                                        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 @@ static int odbc_log(struct ast_cdr *cdr)
                                        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;
index 3472e9b6e40c37878735c7a905f82cda5eba2872..d043b39fe8580a9894687915408c92adc4d29df0 100644 (file)
@@ -437,7 +437,7 @@ static void odbc_log(const struct ast_event *event, void *userdata)
                                } 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 @@ static void odbc_log(const struct ast_event *event, void *userdata)
                                        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 @@ static void odbc_log(const struct ast_event *event, void *userdata)
                                        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)) {
index 3b44d71d9bbcf08479bf93636a15e23dad0f7e87..16baa4a9994c757b63af5cfe8e004f35053362bb 100644 (file)
@@ -192,11 +192,11 @@ static void pgsql_log(const struct ast_event *event, void *userdata)
                                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 */
index 2bbc74d6a21513c8af80b9c1615239603d715f42..bba25a81db7672ec099ad448466230118255ee65 100644 (file)
@@ -202,12 +202,12 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream)
        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 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream)
        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);
        }
index 04e25ff711545597407510bc96a0de02a3dacaf2..2043d6b11b02de99781a877346128870484d53a3 100644 (file)
@@ -2069,7 +2069,7 @@ static void my_handle_dtmf(void *pvt, struct ast_channel *ast, enum analog_sub a
 
        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 @@ static int my_dial_digits(void *pvt, enum analog_sub sub, struct analog_dialoper
        }
 
        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 @@ static void dahdi_handle_dtmf(struct ast_channel *ast, int idx, struct ast_frame
 
        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 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast)
                                                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 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast)
                                        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 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast)
                                        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 @@ winkflashdone:
                        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 @@ winkflashdone:
                                        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 @@ winkflashdone:
                        (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 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast)
                                        /* 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 @@ static int dahdi_write(struct ast_channel *ast, struct ast_frame *frame)
        /* 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 @@ static struct ast_str *create_channel_name(struct dahdi_pvt *i)
                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 @@ static char *dahdi_show_channel(struct ast_cli_entry *e, int cmd, struct ast_cli
                        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 @@ static char *dahdi_show_channel(struct ast_cli_entry *e, int cmd, struct ast_cli
 
                                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 @@ static char *dahdi_show_channel(struct ast_cli_entry *e, int cmd, struct ast_cli
                        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 @@ static void process_echocancel(struct dahdi_chan_conf *confp, const char *data,
                } param;
 
                if (ast_app_separate_args(params[x], '=', (char **) &param, 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 @@ static void process_echocancel(struct dahdi_chan_conf *confp, const char *data,
 
                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;
                        }
                }
index 6ef6d2c01f15723106ec69cd06542b4f64a70b96..bd6e2f2f151d1a9ca0f9c6d2d3a4022ad2109456 100644 (file)
@@ -890,8 +890,8 @@ static int gtalk_create_candidates(struct gtalk *client, struct gtalk_pvt *p, ch
        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 @@ static struct gtalk_pvt *gtalk_alloc(struct gtalk *client, const char *us, const
                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 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i,
                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 @@ static int gtalk_write(struct ast_channel *ast, struct ast_frame *frame)
                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;
        }
index 02a5f8b1dad40daa0acd2221aca0378a4e49a655..378ce8ce09f6f0783aebc39734382a8acaed594e 100644 (file)
@@ -356,7 +356,7 @@ static int (*iax2_regfunk)(const char *username, int onoff) = NULL;
                        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 @@ static int calltoken_required(struct sockaddr_in *sin, const char *name, int sub
                user_unref(user);
        }
 
-       ast_debug(1, "Determining if address %s with username %s requires calltoken validation.  Optional = %d  calltoken_required = %\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 @@ static int try_firmware(char *s)
        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 @@ static int send_packet(struct iax_frame *f)
        
        /* 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));
+               ast_debug(3, "Sending %u 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));
        
        if (f->transfer) {
                iax_outputframe(f, NULL, 0, &iaxs[callno]->transfer, f->datalen - sizeof(struct ast_iax2_full_hdr));
@@ -3589,7 +3589,7 @@ static void __attempt_transmit(const void *data)
                                iax2_destroy(callno);
                        } else {
                                if (iaxs[callno]->owner) {
-                                       ast_log(LOG_WARNING, "Max retries exceeded to host %s on %s (type = %d, subclass = %u, ts=%d, seqno=%d)\n",
+                                       ast_log(LOG_WARNING, "Max retries exceeded to host %s on %s (type = %u, subclass = %d, ts=%u, seqno=%d)\n",
                                                ast_inet_ntoa(iaxs[f->callno]->addr.sin_addr),
                                                iaxs[f->callno]->owner->name,
                                                f->af.frametype,
@@ -5490,7 +5490,7 @@ static int iax2_key_rotate(const void *vpvt)
        pvt->keyrotateid = 
                ast_sched_thread_add(sched, 120000 + (ast_random() % 180001), iax2_key_rotate, vpvt);
 
-       snprintf(key, sizeof(key), "%lX", ast_random());
+       snprintf(key, sizeof(key), "%lX", (unsigned long)ast_random());
 
        MD5Init(&md5);
        MD5Update(&md5, (unsigned char *) key, strlen(key));
@@ -5774,7 +5774,7 @@ static int iax2_indicate(struct ast_channel *c, int condition, const void *data,
        case AST_CONTROL_REDIRECTING:
                if (!ast_test_flag64(pvt, IAX_SENDCONNECTEDLINE)) {
                        /* We are not configured to allow sending these updates. */
-                       ast_debug(2, "Callno %u: Config blocked sending control frame %d.\n",
+                       ast_debug(2, "Callno %d: Config blocked sending control frame %d.\n",
                                callno, condition);
                        goto done;
                }
@@ -6096,7 +6096,7 @@ static unsigned int calc_timestamp(struct chan_iax2_pvt *p, unsigned int ts, str
                                * frame size too) */
 
                                if (iaxdebug && abs(ms - p->nextpred) > MAX_TIMESTAMP_SKEW )
-                                       ast_debug(1, "predicted timestamp skew (%u) > max (%u), using real ts instead.\n",
+                                       ast_debug(1, "predicted timestamp skew (%d) > max (%d), using real ts instead.\n",
                                                abs(ms - p->nextpred), MAX_TIMESTAMP_SKEW);
 
                                if (f->samples >= rate) /* check to make sure we don't core dump */
@@ -6151,7 +6151,7 @@ static unsigned int calc_rxstamp(struct chan_iax2_pvt *p, unsigned int offset)
        if (ast_tvzero(p->rxcore)) {
                p->rxcore = ast_tvnow();
                if (iaxdebug)
-                       ast_debug(1, "calc_rxstamp: call=%d: rxcore set to %d.%6.6d - %dms\n",
+                       ast_debug(1, "calc_rxstamp: call=%d: rxcore set to %d.%6.6d - %ums\n",
                                        p->callno, (int)(p->rxcore.tv_sec), (int)(p->rxcore.tv_usec), offset);
                p->rxcore = ast_tvsub(p->rxcore, ast_samp2tv(offset, 1000));
 #if 1
@@ -6236,7 +6236,7 @@ static int iax2_trunk_queue(struct chan_iax2_pvt *pvt, struct iax_frame *fr)
                                
                                tpeer->trunkdataalloc += DEFAULT_TRUNKDATA;
                                tpeer->trunkdata = tmp;
-                               ast_debug(1, "Expanded trunk '%s:%d' to %d bytes\n", ast_inet_ntoa(tpeer->addr.sin_addr), ntohs(tpeer->addr.sin_port), tpeer->trunkdataalloc);
+                               ast_debug(1, "Expanded trunk '%s:%d' to %u bytes\n", ast_inet_ntoa(tpeer->addr.sin_addr), ntohs(tpeer->addr.sin_port), tpeer->trunkdataalloc);
                        } else {
                                ast_log(LOG_WARNING, "Maximum trunk data space exceeded to %s:%d\n", ast_inet_ntoa(tpeer->addr.sin_addr), ntohs(tpeer->addr.sin_port));
                                ast_mutex_unlock(&tpeer->lock);
@@ -6376,7 +6376,7 @@ static int decode_frame(ast_aes_decrypt_key *dcx, struct ast_iax2_full_hdr *fh,
 
                padding = 16 + (workspace[15] & 0x0f);
                if (iaxdebug)
-                       ast_debug(1, "Decoding full frame with length %d (padding = %d) (15=%02x)\n", *datalen, padding, workspace[15]);
+                       ast_debug(1, "Decoding full frame with length %d (padding = %d) (15=%02x)\n", *datalen, padding, (unsigned)workspace[15]);
                if (*datalen < padding + sizeof(struct ast_iax2_full_hdr))
                        return -1;
 
@@ -6423,7 +6423,7 @@ static int encrypt_frame(ast_aes_encrypt_key *ecx, struct ast_iax2_full_hdr *fh,
                workspace[15] &= 0xf0;
                workspace[15] |= (padding & 0xf);
                if (iaxdebug)
-                       ast_debug(1, "Encoding full frame %d/%d with length %d + %d padding (15=%02x)\n", fh->type, fh->csub, *datalen, padding, workspace[15]);
+                       ast_debug(1, "Encoding full frame %d/%d with length %d + %d padding (15=%02x)\n", fh->type, fh->csub, *datalen, padding, (unsigned)workspace[15]);
                *datalen += padding;
                memcpy_encrypt(efh->encdata, workspace, *datalen - sizeof(struct ast_iax2_full_enc_hdr), ecx);
                if (*datalen >= 32 + sizeof(struct ast_iax2_full_enc_hdr))
@@ -6919,10 +6919,10 @@ static char *handle_cli_iax2_show_threads(struct ast_cli_entry *e, int cmd, stru
        AST_LIST_LOCK(&idle_list);
        AST_LIST_TRAVERSE(&idle_list, thread, list) {
 #ifdef DEBUG_SCHED_MULTITHREAD
-               ast_cli(a->fd, "Thread %d: state=%d, update=%d, actions=%d, func='%s'\n", 
+               ast_cli(a->fd, "Thread %d: state=%u, update=%d, actions=%d, func='%s'\n", 
                        thread->threadnum, thread->iostate, (int)(t - thread->checktime), thread->actions, thread->curfunc);
 #else
-               ast_cli(a->fd, "Thread %d: state=%d, update=%d, actions=%d\n", 
+               ast_cli(a->fd, "Thread %d: state=%u, update=%d, actions=%d\n", 
                        thread->threadnum, thread->iostate, (int)(t - thread->checktime), thread->actions);
 #endif
                threadcount++;
@@ -6936,10 +6936,10 @@ static char *handle_cli_iax2_show_threads(struct ast_cli_entry *e, int cmd, stru
                else
                        type = 'P';
 #ifdef DEBUG_SCHED_MULTITHREAD
-               ast_cli(a->fd, "Thread %c%d: state=%d, update=%d, actions=%d, func='%s'\n", 
+               ast_cli(a->fd, "Thread %c%d: state=%u, update=%d, actions=%d, func='%s'\n", 
                        type, thread->threadnum, thread->iostate, (int)(t - thread->checktime), thread->actions, thread->curfunc);
 #else
-               ast_cli(a->fd, "Thread %c%d: state=%d, update=%d, actions=%d\n", 
+               ast_cli(a->fd, "Thread %c%d: state=%u, update=%d, actions=%d\n", 
                        type, thread->threadnum, thread->iostate, (int)(t - thread->checktime), thread->actions);
 #endif
                threadcount++;
@@ -6949,10 +6949,10 @@ static char *handle_cli_iax2_show_threads(struct ast_cli_entry *e, int cmd, stru
        AST_LIST_LOCK(&dynamic_list);
        AST_LIST_TRAVERSE(&dynamic_list, thread, list) {
 #ifdef DEBUG_SCHED_MULTITHREAD
-               ast_cli(a->fd, "Thread %d: state=%d, update=%d, actions=%d, func='%s'\n",
+               ast_cli(a->fd, "Thread %d: state=%u, update=%d, actions=%d, func='%s'\n",
                        thread->threadnum, thread->iostate, (int)(t - thread->checktime), thread->actions, thread->curfunc);
 #else
-               ast_cli(a->fd, "Thread %d: state=%d, update=%d, actions=%d\n",
+               ast_cli(a->fd, "Thread %d: state=%u, update=%d, actions=%d\n",
                        thread->threadnum, thread->iostate, (int)(t - thread->checktime), thread->actions);
 #endif
                dynamiccount++;
@@ -7349,8 +7349,8 @@ static int ast_cli_netstats(struct mansession *s, int fd, int limit_fmt)
        int numchans = 0;
        char first_message[10] = { 0, };
        char last_message[10] = { 0, };
-#define ACN_FORMAT1 "%-20.25s %4d %4d %4d %5d %3d %5d %4d %6d %4d %4d %5d %3d %5d %4d %6d %s%s %4s%s\n"
-#define ACN_FORMAT2 "%s %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %s%s %s%s\n"
+#define ACN_FORMAT1 "%-20.25s %4u %4d %4d %5d %3d %5d %4d %6d %4d %4d %5d %3d %5d %4d %6d %s%s %4s%s\n"
+#define ACN_FORMAT2 "%s %u %d %d %d %d %d %d %d %d %d %d %d %d %d %d %s%s %s%s\n"
        for (x = 0; x < ARRAY_LEN(iaxs); x++) {
                ast_mutex_lock(&iaxsl[x]);
                if (iaxs[x]) {
@@ -7607,7 +7607,7 @@ static int send_command(struct chan_iax2_pvt *i, char type, int command, unsigne
 {
        if (type == AST_FRAME_CONTROL && !iax2_is_control_frame_allowed(command)) {
                /* Control frame should not go out on the wire. */
-               ast_debug(2, "Callno %u: Blocked sending control frame %d.\n",
+               ast_debug(2, "Callno %d: Blocked sending control frame %d.\n",
                        i->callno, command);
                return 0;
        }
@@ -8047,7 +8047,7 @@ static int authenticate_verify(struct chan_iax2_pvt *p, struct iax_ies *ies)
                        MD5Final(digest, &md5);
                        /* If they support md5, authenticate with it.  */
                        for (x=0;x<16;x++)
-                               sprintf(requeststr + (x << 1), "%2.2x", digest[x]); /* safe */
+                               sprintf(requeststr + (x << 1), "%2.2x", (unsigned)digest[x]); /* safe */
                        if (!strcasecmp(requeststr, md5secret)) {
                                res = 0;
                                break;
@@ -8177,7 +8177,7 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
                        MD5Update(&md5, (unsigned char *)tmppw, strlen(tmppw));
                        MD5Final(digest, &md5);
                        for (x=0;x<16;x++)
-                               sprintf(requeststr + (x << 1), "%2.2x", digest[x]); /* safe */
+                               sprintf(requeststr + (x << 1), "%2.2x", (unsigned)digest[x]); /* safe */
                        if (!strcasecmp(requeststr, md5secret))
                                break;
                }
@@ -8260,7 +8260,7 @@ static int authenticate(const char *challenge, const char *secret, const char *k
                        MD5Final(digest, &md5);
                        /* If they support md5, authenticate with it.  */
                        for (x=0;x<16;x++)
-                               sprintf(digres + (x << 1),  "%2.2x", digest[x]); /* safe */
+                               sprintf(digres + (x << 1),  "%2.2x", (unsigned)digest[x]); /* safe */
                        if (pvt) {
                                build_encryption_keys(digest, pvt);
                        }
@@ -9314,7 +9314,7 @@ static int timing_read(int *id, int fd, short events, void *cbdata)
                        res = send_trunk(tpeer, &now);
                        trunk_timed++; 
                        if (iaxtrunkdebug)
-                               ast_verbose(" - Trunk peer (%s:%d) has %d call chunk%s in transit, %d bytes backloged and has hit a high water mark of %d bytes\n", ast_inet_ntoa(tpeer->addr.sin_addr), ntohs(tpeer->addr.sin_port), res, (res != 1) ? "s" : "", tpeer->trunkdatalen, tpeer->trunkdataalloc);
+                               ast_verbose(" - Trunk peer (%s:%d) has %d call chunk%s in transit, %u bytes backloged and has hit a high water mark of %u bytes\n", ast_inet_ntoa(tpeer->addr.sin_addr), ntohs(tpeer->addr.sin_port), res, (res != 1) ? "s" : "", tpeer->trunkdatalen, tpeer->trunkdataalloc);
                }               
                totalcalls += res;      
                res = 0;
@@ -9624,7 +9624,7 @@ static void log_jitterstats(unsigned short callno)
                        localooo = jbinfo.frames_ooo;
                        localpackets = jbinfo.frames_in;
                }
-               ast_debug(3, "JB STATS:%s ping=%d ljitterms=%d ljbdelayms=%d ltotlost=%d lrecentlosspct=%d ldropped=%d looo=%d lrecvd=%d rjitterms=%d rjbdelayms=%d rtotlost=%d rrecentlosspct=%d rdropped=%d rooo=%d rrecvd=%d\n",
+               ast_debug(3, "JB STATS:%s ping=%u ljitterms=%d ljbdelayms=%d ltotlost=%d lrecentlosspct=%d ldropped=%d looo=%d lrecvd=%d rjitterms=%d rjbdelayms=%d rtotlost=%d rrecentlosspct=%d rdropped=%d rooo=%d rrecvd=%d\n",
                        iaxs[callno]->owner->name,
                        iaxs[callno]->pingtime,
                        localjitter,
@@ -9641,7 +9641,7 @@ static void log_jitterstats(unsigned short callno)
                        iaxs[callno]->remote_rr.dropped,
                        iaxs[callno]->remote_rr.ooo,
                        iaxs[callno]->remote_rr.packets);
-               manager_event(EVENT_FLAG_REPORTING, "JitterBufStats", "Owner: %s\r\nPing: %d\r\nLocalJitter: %d\r\nLocalJBDelay: %d\r\nLocalTotalLost: %d\r\nLocalLossPercent: %d\r\nLocalDropped: %d\r\nLocalooo: %d\r\nLocalReceived: %d\r\nRemoteJitter: %d\r\nRemoteJBDelay: %d\r\nRemoteTotalLost: %d\r\nRemoteLossPercent: %d\r\nRemoteDropped: %d\r\nRemoteooo: %d\r\nRemoteReceived: %d\r\n",
+               manager_event(EVENT_FLAG_REPORTING, "JitterBufStats", "Owner: %s\r\nPing: %u\r\nLocalJitter: %d\r\nLocalJBDelay: %d\r\nLocalTotalLost: %d\r\nLocalLossPercent: %d\r\nLocalDropped: %d\r\nLocalooo: %d\r\nLocalReceived: %d\r\nRemoteJitter: %d\r\nRemoteJBDelay: %d\r\nRemoteTotalLost: %d\r\nRemoteLossPercent: %d\r\nRemoteDropped: %d\r\nRemoteooo: %d\r\nRemoteReceived: %d\r\n",
                        iaxs[callno]->owner->name,
                        iaxs[callno]->pingtime,
                        localjitter,
@@ -10279,7 +10279,7 @@ static int socket_process(struct iax2_thread *thread)
        }
        if (ntohs(mh->callno) & IAX_FLAG_FULL) {
                if (iaxdebug)
-                       ast_debug(1, "Received packet %d, (%d, %u)\n", fh->oseqno, f.frametype, f.subclass.integer);
+                       ast_debug(1, "Received packet %d, (%u, %d)\n", fh->oseqno, f.frametype, f.subclass.integer);
                /* Check if it's out of order (and not an ACK or INVAL) */
                fr->oseqno = fh->oseqno;
                fr->iseqno = fh->iseqno;
@@ -10319,7 +10319,7 @@ static int socket_process(struct iax2_thread *thread)
                          (f.subclass.integer != IAX_COMMAND_VNAK)) ||
                          (f.frametype != AST_FRAME_IAX)) {
                                /* If it's not an ACK packet, it's out of order. */
-                               ast_debug(1, "Packet arrived out of order (expecting %d, got %d) (frametype = %d, subclass = %d)\n", 
+                               ast_debug(1, "Packet arrived out of order (expecting %d, got %d) (frametype = %u, subclass = %d)\n", 
                                        iaxs[fr->callno]->iseqno, fr->oseqno, f.frametype, f.subclass.integer);
                                /* Check to see if we need to request retransmission,
                                 * and take sequence number wraparound into account */
@@ -10556,7 +10556,7 @@ static int socket_process(struct iax2_thread *thread)
                             f.subclass.integer != IAX_COMMAND_LAGRP) {
                                iaxs[fr->callno]->last = fr->ts;
                                if (iaxdebug)
-                                       ast_debug(1, "For call=%d, set last=%d\n", fr->callno, fr->ts);
+                                       ast_debug(1, "For call=%d, set last=%u\n", fr->callno, fr->ts);
                        }
                        iaxs[fr->callno]->last_iax_message = f.subclass.integer;
                        if (!iaxs[fr->callno]->first_iax_message) {
@@ -11051,14 +11051,14 @@ static int socket_process(struct iax2_thread *thread)
                                        peer = iaxs[fr->callno]->peerpoke;
                                        if ((peer->lastms < 0)  || (peer->historicms > peer->maxms)) {
                                                if (iaxs[fr->callno]->pingtime <= peer->maxms) {
-                                                       ast_log(LOG_NOTICE, "Peer '%s' is now REACHABLE! Time: %d\n", peer->name, iaxs[fr->callno]->pingtime);
-                                                       manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Reachable\r\nTime: %d\r\n", peer->name, iaxs[fr->callno]->pingtime); 
+                                                       ast_log(LOG_NOTICE, "Peer '%s' is now REACHABLE! Time: %u\n", peer->name, iaxs[fr->callno]->pingtime);
+                                                       manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Reachable\r\nTime: %u\r\n", peer->name, iaxs[fr->callno]->pingtime); 
                                                        ast_devstate_changed(AST_DEVICE_NOT_INUSE, AST_DEVSTATE_CACHABLE, "IAX2/%s", peer->name); /* Activate notification */
                                                }
                                        } else if ((peer->historicms > 0) && (peer->historicms <= peer->maxms)) {
                                                if (iaxs[fr->callno]->pingtime > peer->maxms) {
-                                                       ast_log(LOG_NOTICE, "Peer '%s' is now TOO LAGGED (%d ms)!\n", peer->name, iaxs[fr->callno]->pingtime);
-                                                       manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Lagged\r\nTime: %d\r\n", peer->name, iaxs[fr->callno]->pingtime); 
+                                                       ast_log(LOG_NOTICE, "Peer '%s' is now TOO LAGGED (%u ms)!\n", peer->name, iaxs[fr->callno]->pingtime);
+                                                       manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Lagged\r\nTime: %u\r\n", peer->name, iaxs[fr->callno]->pingtime); 
                                                        ast_devstate_changed(AST_DEVICE_UNAVAILABLE, AST_DEVSTATE_CACHABLE, "IAX2/%s", peer->name); /* Activate notification */
                                                }
                                        }
@@ -11748,7 +11748,7 @@ immediatedial:
        if (f.frametype == AST_FRAME_CONTROL) {
                if (!iax2_is_control_frame_allowed(f.subclass.integer)) {
                        /* Control frame not allowed to come from the wire. */
-                       ast_debug(2, "Callno %u: Blocked receiving control frame %d.\n",
+                       ast_debug(2, "Callno %d: Blocked receiving control frame %d.\n",
                                fr->callno, f.subclass.integer);
                        ast_variables_destroy(ies.vars);
                        ast_mutex_unlock(&iaxsl[fr->callno]);
@@ -11759,7 +11759,7 @@ immediatedial:
                        if (iaxs[fr->callno]
                                && !ast_test_flag64(iaxs[fr->callno], IAX_RECVCONNECTEDLINE)) {
                                /* We are not configured to allow receiving these updates. */
-                               ast_debug(2, "Callno %u: Config blocked receiving control frame %d.\n",
+                               ast_debug(2, "Callno %d: Config blocked receiving control frame %d.\n",
                                        fr->callno, f.subclass.integer);
                                ast_variables_destroy(ies.vars);
                                ast_mutex_unlock(&iaxsl[fr->callno]);
@@ -11831,7 +11831,7 @@ immediatedial:
                fr->outoforder = 0;
        } else {
                if (iaxdebug && iaxs[fr->callno]) {
-                       ast_debug(1, "Received out of order packet... (type=%d, subclass %d, ts = %d, last = %d)\n", f.frametype, f.subclass.integer, fr->ts, iaxs[fr->callno]->last);
+                       ast_debug(1, "Received out of order packet... (type=%u, subclass %d, ts = %u, last = %u)\n", f.frametype, f.subclass.integer, fr->ts, iaxs[fr->callno]->last);
                }
                fr->outoforder = -1;
        }
@@ -11846,7 +11846,7 @@ immediatedial:
                iaxs[fr->callno]->last = fr->ts;
 #if 1
                if (iaxdebug)
-                       ast_debug(1, "For call=%d, set last=%d\n", fr->callno, fr->ts);
+                       ast_debug(1, "For call=%d, set last=%u\n", fr->callno, fr->ts);
 #endif
        }
 
@@ -14263,7 +14263,7 @@ static int iax2_devicestate(void *data)
                return res;
 
        res = AST_DEVICE_UNAVAILABLE;
-       ast_debug(3, "Found peer. What's device state of %s? addr=%d, defaddr=%d maxms=%d, lastms=%d\n",
+       ast_debug(3, "Found peer. What's device state of %s? addr=%u, defaddr=%u maxms=%d, lastms=%d\n",
                pds.peer, ast_sockaddr_ipv4(&p->addr), p->defaddr.sin_addr.s_addr, p->maxms, p->lastms);
        
        if ((ast_sockaddr_ipv4(&p->addr) || p->defaddr.sin_addr.s_addr) &&
index 78162a05c1817cea037d845a06ae8ffd096e90a0..ff81afac3641afa3a89a81d1831d653d85519856 100644 (file)
@@ -635,10 +635,10 @@ static int jingle_create_candidates(struct jingle *client, struct jingle_pvt *p,
        ours1->port = ntohs(sin.sin_port);
        ours1->priority = 1678246398;
        ours1->protocol = AJI_PROTOCOL_UDP;
-       snprintf(pass, sizeof(pass), "%08lx%08lx", ast_random(), ast_random());
+       snprintf(pass, sizeof(pass), "%08lx%08lx", (unsigned long)ast_random(), (unsigned long)ast_random());
        ast_copy_string(ours1->password, pass, sizeof(ours1->password));
        ours1->type = AJI_CONNECT_HOST;
-       snprintf(user, sizeof(user), "%08lx%08lx", ast_random(), ast_random());
+       snprintf(user, sizeof(user), "%08lx%08lx", (unsigned long)ast_random(), (unsigned long)ast_random());
        ast_copy_string(ours1->ufrag, user, sizeof(ours1->ufrag));
        p->ourcandidates = ours1;
 
@@ -655,11 +655,11 @@ static int jingle_create_candidates(struct jingle *client, struct jingle_pvt *p,
                ours2->port = ntohs(sin.sin_port);
                ours2->priority = 1678246397;
                ours2->protocol = AJI_PROTOCOL_UDP;
-               snprintf(pass, sizeof(pass), "%08lx%08lx", ast_random(), ast_random());
+               snprintf(pass, sizeof(pass), "%08lx%08lx", (unsigned long)ast_random(), (unsigned long)ast_random());
                ast_copy_string(ours2->password, pass, sizeof(ours2->password));
                ours2->type = AJI_CONNECT_PRFLX;
 
-               snprintf(user, sizeof(user), "%08lx%08lx", ast_random(), ast_random());
+               snprintf(user, sizeof(user), "%08lx%08lx", (unsigned long)ast_random(), (unsigned long)ast_random());
                ast_copy_string(ours2->ufrag, user, sizeof(ours2->ufrag));
                ours1->next = ours2;
                ours2 = NULL;
@@ -782,7 +782,7 @@ static struct jingle_pvt *jingle_alloc(struct jingle *client, const char *from,
                ast_copy_string(tmp->sid, sid, sizeof(tmp->sid));
                ast_copy_string(tmp->them, from, sizeof(tmp->them));
        } else {
-               snprintf(tmp->sid, sizeof(tmp->sid), "%08lx%08lx", ast_random(), ast_random());
+               snprintf(tmp->sid, sizeof(tmp->sid), "%08lx%08lx", (unsigned long)ast_random(), (unsigned long)ast_random());
                ast_copy_string(tmp->them, idroster, sizeof(tmp->them));
                tmp->initiator = 1;
        }
@@ -815,7 +815,7 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt *
                str = title;
        else
                str = i->them;
-       tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, "", "", "", linkedid, 0, "Jingle/%s-%04lx", str, ast_random() & 0xffff);
+       tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, "", "", "", linkedid, 0, "Jingle/%s-%04lx", str, (unsigned long)(ast_random() & 0xffff));
        if (!tmp) {
                ast_log(LOG_WARNING, "Unable to allocate Jingle channel structure!\n");
                return NULL;
@@ -1259,7 +1259,7 @@ static int jingle_write(struct ast_channel *ast, struct ast_frame *frame)
                return 0;
                break;
        default:
-               ast_log(LOG_WARNING, "Can't send %d type frames with Jingle write\n",
+               ast_log(LOG_WARNING, "Can't send %u type frames with Jingle write\n",
                                frame->frametype);
                return 0;
        }
index 2d283eb719e5d011ffa7f0f0ce557e44c8ada039..f7295ee3edc573f7df8e498890bcaf2a7ba48ee7 100644 (file)
@@ -1201,8 +1201,8 @@ static struct ast_channel *local_new(struct local_pvt *p, int state, const char
 
        /* Make sure that the ;2 channel gets the same linkedid as ;1. You can't pass linkedid to both
         * allocations since if linkedid isn't set, then each channel will generate its own linkedid. */
-       if (!(tmp = ast_channel_alloc(1, state, 0, 0, t, p->exten, p->context, linkedid, ama, "Local/%s@%s-%08x;1", p->exten, p->context, generated_seqno))
-               || !(tmp2 = ast_channel_alloc(1, AST_STATE_RING, 0, 0, t, p->exten, p->context, tmp->linkedid, ama, "Local/%s@%s-%08x;2", p->exten, p->context, generated_seqno))) {
+       if (!(tmp = ast_channel_alloc(1, state, 0, 0, t, p->exten, p->context, linkedid, ama, "Local/%s@%s-%08x;1", p->exten, p->context, (unsigned)generated_seqno))
+               || !(tmp2 = ast_channel_alloc(1, AST_STATE_RING, 0, 0, t, p->exten, p->context, tmp->linkedid, ama, "Local/%s@%s-%08x;2", p->exten, p->context, (unsigned)generated_seqno))) {
                if (tmp) {
                        tmp = ast_channel_release(tmp);
                }
index d2a524fe84a2b108150a9a615222398b5ef81ca8..321f0ccf470ea3db0fb9c5938b981249c253d35d 100644 (file)
@@ -1250,7 +1250,7 @@ static int mgcp_write(struct ast_channel *ast, struct ast_frame *frame)
                if (frame->frametype == AST_FRAME_IMAGE)
                        return 0;
                else {
-                       ast_log(LOG_WARNING, "Can't send %d type frames with MGCP write\n", frame->frametype);
+                       ast_log(LOG_WARNING, "Can't send %u type frames with MGCP write\n", frame->frametype);
                        return 0;
                }
        } else {
@@ -2020,7 +2020,7 @@ static int process_sdp(struct mgcp_subchannel *sub, struct mgcp_request *req)
        sdpLineNum_iterator_init(&iterator);
        while ((a = get_sdp_iterate(&iterator, req, "a"))[0] != '\0') {
                char* mimeSubtype = ast_strdupa(a); /* ensures we have enough space */
-               if (sscanf(a, "rtpmap: %30u %127[^/]/", &codec, mimeSubtype) != 2)
+               if (sscanf(a, "rtpmap: %30d %127[^/]/", &codec, mimeSubtype) != 2)
                        continue;
                /* Note: should really look at the 'freq' and '#chans' params too */
                ast_rtp_codecs_payloads_set_rtpmap_type(ast_rtp_instance_get_codecs(sub->rtp), sub->rtp, codec, "audio", mimeSubtype, 0);
@@ -2115,9 +2115,9 @@ static int init_req(struct mgcp_endpoint *p, struct mgcp_request *req, char *ver
        req->header[req->headers] = req->data + req->len;
        /* check if we need brackets around the gw name */
        if (p->parent->isnamedottedip) {
-               snprintf(req->header[req->headers], sizeof(req->data) - req->len, "%s %d %s@[%s] MGCP 1.0%s\r\n", verb, oseq, p->name, p->parent->name, p->ncs ? " NCS 1.0" : "");
+               snprintf(req->header[req->headers], sizeof(req->data) - req->len, "%s %u %s@[%s] MGCP 1.0%s\r\n", verb, oseq, p->name, p->parent->name, p->ncs ? " NCS 1.0" : "");
        } else {
-+              snprintf(req->header[req->headers], sizeof(req->data) - req->len, "%s %d %s@%s MGCP 1.0%s\r\n", verb, oseq, p->name, p->parent->name, p->ncs ? " NCS 1.0" : "");
++              snprintf(req->header[req->headers], sizeof(req->data) - req->len, "%s %u %s@%s MGCP 1.0%s\r\n", verb, oseq, p->name, p->parent->name, p->ncs ? " NCS 1.0" : "");
        }
        req->len += strlen(req->header[req->headers]);
        if (req->headers < MGCP_MAX_HEADERS) {
@@ -2775,7 +2775,7 @@ static void handle_response(struct mgcp_endpoint *p, struct mgcp_subchannel *sub
                req = find_command(p, sub, &p->cmd_queue, &p->cmd_queue_lock, ident);
 
        if (!req) {
-               ast_verb(3, "No command found on [%s] for transaction %d. Ignoring...\n",
+               ast_verb(3, "No command found on [%s] for transaction %u. Ignoring...\n",
                                gw->name, ident);
                return;
        }
@@ -2789,10 +2789,10 @@ static void handle_response(struct mgcp_endpoint *p, struct mgcp_subchannel *sub
                        p->hookstate = MGCP_ONHOOK;
                        break;
                case 406:
-                       ast_log(LOG_NOTICE, "Transaction %d timed out\n", ident);
+                       ast_log(LOG_NOTICE, "Transaction %u timed out\n", ident);
                        break;
                case 407:
-                       ast_log(LOG_NOTICE, "Transaction %d aborted\n", ident);
+                       ast_log(LOG_NOTICE, "Transaction %u aborted\n", ident);
                        break;
                }
                if (sub) {
@@ -2945,7 +2945,7 @@ static void start_rtp(struct mgcp_subchannel *sub)
                ast_rtp_instance_set_prop(sub->rtp, AST_RTP_PROPERTY_NAT, sub->nat);
        }
        /* Make a call*ID */
-       snprintf(sub->callid, sizeof(sub->callid), "%08lx%s", ast_random(), sub->txident);
+       snprintf(sub->callid, sizeof(sub->callid), "%08lx%s", (unsigned long)ast_random(), sub->txident);
        /* Transmit the connection create */
        if(!sub->parent->pktcgatealloc) {
                transmit_connect_with_sdp(sub, NULL);
@@ -4181,7 +4181,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v)
                                                AST_EVENT_IE_NEWMSGS, AST_EVENT_IE_PLTYPE_EXISTS,
                                                AST_EVENT_IE_END);
                                }
-                               snprintf(e->rqnt_ident, sizeof(e->rqnt_ident), "%08lx", ast_random());
+                               snprintf(e->rqnt_ident, sizeof(e->rqnt_ident), "%08lx", (unsigned long)ast_random());
                                e->msgstate = -1;
                                e->amaflags = amaflags;
                                e->capability = capability;
@@ -4210,7 +4210,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v)
                                e->hookstate = MGCP_ONHOOK;
                                e->chanvars = copy_vars(chanvars);
                                if (!ep_reload) {
-                                       /*snprintf(txident, sizeof(txident), "%08lx", ast_random());*/
+                                       /*snprintf(txident, sizeof(txident), "%08lx", (unsigned long)ast_random());*/
                                        for (i = 0; i < MAX_SUBS; i++) {
                                                sub = ast_calloc(1, sizeof(*sub));
                                                if (sub) {
@@ -4219,7 +4219,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v)
                                                        ast_mutex_init(&sub->cx_queue_lock);
                                                        sub->parent = e;
                                                        sub->id = i;
-                                                       snprintf(sub->txident, sizeof(sub->txident), "%08lx", ast_random());
+                                                       snprintf(sub->txident, sizeof(sub->txident), "%08lx", (unsigned long)ast_random());
                                                        /*stnrcpy(sub->txident, txident, sizeof(sub->txident) - 1);*/
                                                        sub->cxmode = MGCP_CX_INACTIVE;
                                                        sub->nat = nat;
@@ -4320,7 +4320,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v)
                                        e->onhooktime = time(NULL);
                                        /* ASSUME we're onhook */
                                        e->hookstate = MGCP_ONHOOK;
-                                       snprintf(e->rqnt_ident, sizeof(e->rqnt_ident), "%08lx", ast_random());
+                                       snprintf(e->rqnt_ident, sizeof(e->rqnt_ident), "%08lx", (unsigned long)ast_random());
                                }
 
                                for (i = 0, sub = NULL; i < MAX_SUBS; i++) {
@@ -4342,7 +4342,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v)
                                                        ast_copy_string(sub->magic, MGCP_SUBCHANNEL_MAGIC, sizeof(sub->magic));
                                                        sub->parent = e;
                                                        sub->id = i;
-                                                       snprintf(sub->txident, sizeof(sub->txident), "%08lx", ast_random());
+                                                       snprintf(sub->txident, sizeof(sub->txident), "%08lx", (unsigned long)ast_random());
                                                        sub->cxmode = MGCP_CX_INACTIVE;
                                                        sub->next = e->sub;
                                                        e->sub = sub;
index 584e8ea1e10291232cc6a5ca5c70f10083d97bcd..a8b403ad25720502c3c147286323347e6854eba8 100644 (file)
@@ -528,7 +528,7 @@ static struct ast_frame  *phone_exception(struct ast_channel *ast)
                                ast_setstate(ast, AST_STATE_UP);
                                return &p->fr;
                        }  else 
-                               ast_log(LOG_WARNING, "Got off hook in weird state %d\n", ast->_state);
+                               ast_log(LOG_WARNING, "Got off hook in weird state %u\n", ast->_state);
                }
        }
 #if 1
@@ -658,7 +658,7 @@ static int phone_write(struct ast_channel *ast, struct ast_frame *frame)
        /* Write a frame of (presumably voice) data */
        if (frame->frametype != AST_FRAME_VOICE && p->mode != MODE_FXS) {
                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 &
index 6d8b253738dd461bd516bd96f65fb3b906c5269d..450d6edc596c805f3d27f708f39059c61364d63d 100644 (file)
@@ -757,7 +757,7 @@ static int regobjs = 0;       /*!< Registry objects */
 /* }@ */
 
 static struct ast_flags global_flags[3] = {{0}};  /*!< global SIP_ flags */
-static int global_t38_maxdatagram;                /*!< global T.38 FaxMaxDatagram override */
+static unsigned int global_t38_maxdatagram;                /*!< global T.38 FaxMaxDatagram override */
 
 static struct ast_event_sub *network_change_event_subscription; /*!< subscription id for network change events */
 static int network_change_event_sched_id = -1;
@@ -3058,7 +3058,7 @@ static void *_sip_tcp_helper_thread(struct ast_tcptls_session_instance *tcptls_s
                                }
                                break;
                        default:
-                               ast_log(LOG_ERROR, "Unknown tcptls thread alert '%d'\n", alert);
+                               ast_log(LOG_ERROR, "Unknown tcptls thread alert '%u'\n", alert);
                        }
                }
        }
@@ -3304,7 +3304,7 @@ void dialog_unlink_all(struct sip_pvt *dialog)
 
 void *registry_unref(struct sip_registry *reg, char *tag)
 {
-       ast_debug(3, "SIP Registry %s: refcount now %d\n", reg->hostname, reg->refcount - 1);
+       ast_debug(3, "SIP Registry %s: refcount now %u\n", reg->hostname, reg->refcount - 1);
        ASTOBJ_UNREF(reg, sip_registry_destroy);
        return NULL;
 }
@@ -3312,7 +3312,7 @@ void *registry_unref(struct sip_registry *reg, char *tag)
 /*! \brief Add object reference to SIP registry */
 static struct sip_registry *registry_addref(struct sip_registry *reg, char *tag)
 {
-       ast_debug(3, "SIP Registry %s: refcount now %d\n", reg->hostname, reg->refcount + 1);
+       ast_debug(3, "SIP Registry %s: refcount now %u\n", reg->hostname, reg->refcount + 1);
        return ASTOBJ_REF(reg); /* Add pointer to registry in packet */
 }
 
@@ -3716,7 +3716,7 @@ static void build_via(struct sip_pvt *p)
        snprintf(p->via, sizeof(p->via), "SIP/2.0/%s %s;branch=z9hG4bK%08x%s",
                 get_transport_pvt(p),
                 ast_sockaddr_stringify_remote(&p->ourip),
-                (int) p->branch, rport);
+                (unsigned)p->branch, rport);
 }
 
 /*! \brief NAT fix - decide which IP address to use for Asterisk server?
@@ -4074,7 +4074,7 @@ static enum sip_result __sip_reliable_xmit(struct sip_pvt *p, uint32_t seqno, in
        struct sip_pkt *pkt = NULL;
        int siptimer_a = DEFAULT_RETRANS;
        int xmitres = 0;
-       int respid;
+       unsigned respid;
 
        if (sipmethod == SIP_INVITE) {
                /* Note this is a pending invite */
@@ -4791,7 +4791,7 @@ static int sip_sendhtml(struct ast_channel *chan, int subclass, const char *data
        ast_string_field_build(p, url, "<%s>;mode=active", data);
 
        if (sip_debug_test_pvt(p))
-               ast_debug(1, "Send URL %s, state = %d!\n", data, chan->_state);
+               ast_debug(1, "Send URL %s, state = %u!\n", data, chan->_state);
 
        switch (chan->_state) {
        case AST_STATE_RING:
@@ -4808,7 +4808,7 @@ static int sip_sendhtml(struct ast_channel *chan, int subclass, const char *data
                }       
                break;
        default:
-               ast_log(LOG_WARNING, "Don't know how to send URI when state is %d!\n", chan->_state);
+               ast_log(LOG_WARNING, "Don't know how to send URI when state is %u!\n", chan->_state);
        }
 
        return 0;
@@ -5491,7 +5491,7 @@ static void change_t38_state(struct sip_pvt *p, int state)
                return;
 
        p->t38.state = state;
-       ast_debug(2, "T38 state changed to %d on channel %s\n", p->t38.state, chan ? chan->name : "<none>");
+       ast_debug(2, "T38 state changed to %u on channel %s\n", p->t38.state, chan ? chan->name : "<none>");
 
        /* If no channel was provided we can't send off a control frame */
        if (!chan)
@@ -6997,7 +6997,7 @@ static int sip_write(struct ast_channel *ast, struct ast_frame *frame)
                }
                break;
        default:
-               ast_log(LOG_WARNING, "Can't send %d type frames with SIP write\n", frame->frametype);
+               ast_log(LOG_WARNING, "Can't send %u type frames with SIP write\n", frame->frametype);
                return 0;
        }
 
@@ -7481,7 +7481,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
 
                sip_pvt_unlock(i);
                /* Don't hold a sip pvt lock while we allocate a channel */
-               tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, linkedid, i->amaflags, "SIP/%s-%08x", my_name, ast_atomic_fetchadd_int((int *)&chan_idx, +1));
+               tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, linkedid, i->amaflags, "SIP/%s-%08x", my_name, (unsigned)ast_atomic_fetchadd_int((int *)&chan_idx, +1));
        }
        if (!tmp) {
                ast_log(LOG_WARNING, "Unable to allocate AST channel structure for SIP channel\n");
@@ -7857,7 +7857,7 @@ static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p
                                ast_verbose("%c", (arr[i] > ' ' && arr[i] < '}') ? arr[i] : '.');
                        ast_verbose(" -> ");
                        for (i=0; i < f->datalen; i++)
-                               ast_verbose("%02X ", arr[i]);
+                               ast_verbose("%02X ", (unsigned)arr[i]);
                        ast_verbose("\n");
                }
                break;
@@ -7976,7 +7976,7 @@ static char *generate_random_string(char *buf, size_t size)
 
        for (x=0; x<4; x++)
                val[x] = ast_random();
-       snprintf(buf, size, "%08lx%08lx%08lx%08lx", val[0], val[1], val[2], val[3]);
+       snprintf(buf, size, "%08lx%08lx%08lx%08lx", (unsigned long)val[0], (unsigned long)val[1], (unsigned long)val[2], (unsigned long)val[3]);
 
        return buf;
 }
@@ -8068,13 +8068,13 @@ static void build_callid_registry(struct sip_registry *reg, const struct ast_soc
 /*! \brief Build SIP From tag value for REGISTER */
 static void build_localtag_registry(struct sip_registry *reg)
 {
-       ast_string_field_build(reg, localtag, "as%08lx", ast_random());
+       ast_string_field_build(reg, localtag, "as%08lx", (unsigned long)ast_random());
 }
 
 /*! \brief Make our SIP dialog tag */
 static void make_our_tag(struct sip_pvt *pvt)
 {
-       ast_string_field_build(pvt, tag, "as%08lx", ast_random());
+       ast_string_field_build(pvt, tag, "as%08lx", (unsigned long)ast_random());
 }
 
 /*! \brief Allocate Session-Timers struct w/in dialog */
@@ -9159,8 +9159,8 @@ static int get_ip_and_port_from_sdp(struct sip_request *req, const enum media_ty
        const char *c;
        int miterator = req->sdp_start;
        int citerator = req->sdp_start;
-       int x = 0;
-       int numberofports;
+       unsigned int x = 0;
+       unsigned int numberofports;
        int len;
        int af;
        char proto[4], host[258] = ""; /*Initialize to empty so we will know if we have any input */
@@ -9265,7 +9265,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
        int newnoncodeccapability;
 
        const char *codecs;
-       int codec;
+       unsigned int codec;
 
        /* SRTP */
        int secure_audio = FALSE;
@@ -9273,7 +9273,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
 
        /* Others */
        int sendonly = -1;
-       int numberofports;
+       unsigned int numberofports;
        int numberofmediastreams = 0;
        int last_rtpmap_codec = 0;
        int red_data_pt[10];            /* For T.140 RED */
@@ -9360,7 +9360,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
                int text = FALSE;
                int processed_crypto = FALSE;
                char protocol[18] = {0,};
-               int x;
+               unsigned int x;
 
                numberofports = 0;
                len = -1;
@@ -9380,7 +9380,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
 
                                /* Check number of ports offered for stream */
                                if (numberofports > 1) {
-                                       ast_log(LOG_WARNING, "%d ports offered for audio media, not supported by Asterisk. Will try anyway...\n", numberofports);
+                                       ast_log(LOG_WARNING, "%u ports offered for audio media, not supported by Asterisk. Will try anyway...\n", numberofports);
                                }
 
                                if (!strcmp(protocol, "SAVP")) {
@@ -9408,7 +9408,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
                                                return -1;
                                        }
                                        if (debug) {
-                                               ast_verbose("Found RTP audio format %d\n", codec);
+                                               ast_verbose("Found RTP audio format %u\n", codec);
                                        }
 
                                        ast_rtp_codecs_payloads_set_m_type(&newaudiortp, NULL, codec);
@@ -9429,7 +9429,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
 
                                /* Check number of ports offered for stream */
                                if (numberofports > 1) {
-                                       ast_log(LOG_WARNING, "%d ports offered for video media, not supported by Asterisk. Will try anyway...\n", numberofports);
+                                       ast_log(LOG_WARNING, "%u ports offered for video media, not supported by Asterisk. Will try anyway...\n", numberofports);
                                }
 
                                if (!strcmp(protocol, "SAVP")) {
@@ -9458,7 +9458,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
                                                return -1;
                                        }
                                        if (debug) {
-                                               ast_verbose("Found RTP video format %d\n", codec);
+                                               ast_verbose("Found RTP video format %u\n", codec);
                                        }
                                        ast_rtp_codecs_payloads_set_m_type(&newvideortp, NULL, codec);
                                }
@@ -9478,7 +9478,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
 
                                /* Check number of ports offered for stream */
                                if (numberofports > 1) {
-                                       ast_log(LOG_WARNING, "%d ports offered for text media, not supported by Asterisk. Will try anyway...\n", numberofports);
+                                       ast_log(LOG_WARNING, "%u ports offered for text media, not supported by Asterisk. Will try anyway...\n", numberofports);
                                }
 
                                if (p->offered_media[SDP_TEXT].order_offered) {
@@ -9500,7 +9500,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
                                                return -1;
                                        }
                                        if (debug) {
-                                               ast_verbose("Found RTP text format %d\n", codec);
+                                               ast_verbose("Found RTP text format %u\n", codec);
                                        }
                                        ast_rtp_codecs_payloads_set_m_type(&newtextrtp, NULL, codec);
                                }
@@ -10046,7 +10046,7 @@ static int process_sdp_a_sendonly(const char *a, int *sendonly)
 static int process_sdp_a_audio(const char *a, struct sip_pvt *p, struct ast_rtp_codecs *newaudiortp, int *last_rtpmap_codec)
 {
        int found = FALSE;
-       int codec;
+       unsigned int codec;
        char mimeSubtype[128];
        char fmtp_string[64];
        unsigned int sample_rate;
@@ -10082,18 +10082,18 @@ static int process_sdp_a_audio(const char *a, struct sip_pvt *p, struct ast_rtp_
                        if (!(ast_rtp_codecs_payloads_set_rtpmap_type_rate(newaudiortp, NULL, codec, "audio", mimeSubtype,
                            ast_test_flag(&p->flags[0], SIP_G726_NONSTANDARD) ? AST_RTP_OPT_G726_NONSTANDARD : 0, sample_rate))) {
                                if (debug)
-                                       ast_verbose("Found audio description format %s for ID %d\n", mimeSubtype, codec);
+                                       ast_verbose("Found audio description format %s for ID %u\n", mimeSubtype, codec);
                                //found_rtpmap_codecs[last_rtpmap_codec] = codec;
                                (*last_rtpmap_codec)++;
                                found = TRUE;
                        } else {
                                ast_rtp_codecs_payloads_unset(newaudiortp, NULL, codec);
                                if (debug)
-                                       ast_verbose("Found unknown media description format %s for ID %d\n", mimeSubtype, codec);
+                                       ast_verbose("Found unknown media description format %s for ID %u\n", mimeSubtype, codec);
                        }
                } else {
                        if (debug)
-                               ast_verbose("Discarded description format %s for ID %d\n", mimeSubtype, codec);
+                               ast_verbose("Discarded description format %s for ID %u\n", mimeSubtype, codec);
                }
        } else if (sscanf(a, "fmtp: %30u %63s", &codec, fmtp_string) == 2) {
                struct ast_rtp_payload_type payload;
@@ -10106,7 +10106,7 @@ static int process_sdp_a_audio(const char *a, struct sip_pvt *p, struct ast_rtp_
                        case AST_FORMAT_SIREN7:
                                if (sscanf(fmtp_string, "bitrate=%30u", &bit_rate) == 1) {
                                        if (bit_rate != 32000) {
-                                               ast_log(LOG_WARNING, "Got Siren7 offer at %d bps, but only 32000 bps supported; ignoring.\n", bit_rate);
+                                               ast_log(LOG_WARNING, "Got Siren7 offer at %u bps, but only 32000 bps supported; ignoring.\n", bit_rate);
                                                ast_rtp_codecs_payloads_unset(newaudiortp, NULL, codec);
                                        } else {
                                                found = TRUE;
@@ -10116,7 +10116,7 @@ static int process_sdp_a_audio(const char *a, struct sip_pvt *p, struct ast_rtp_
                        case AST_FORMAT_SIREN14:
                                if (sscanf(fmtp_string, "bitrate=%30u", &bit_rate) == 1) {
                                        if (bit_rate != 48000) {
-                                               ast_log(LOG_WARNING, "Got Siren14 offer at %d bps, but only 48000 bps supported; ignoring.\n", bit_rate);
+                                               ast_log(LOG_WARNING, "Got Siren14 offer at %u bps, but only 48000 bps supported; ignoring.\n", bit_rate);
                                                ast_rtp_codecs_payloads_unset(newaudiortp, NULL, codec);
                                        } else {
                                                found = TRUE;
@@ -10126,7 +10126,7 @@ static int process_sdp_a_audio(const char *a, struct sip_pvt *p, struct ast_rtp_
                        case AST_FORMAT_G719:
                                if (sscanf(fmtp_string, "bitrate=%30u", &bit_rate) == 1) {
                                        if (bit_rate != 64000) {
-                                               ast_log(LOG_WARNING, "Got G.719 offer at %d bps, but only 64000 bps supported; ignoring.\n", bit_rate);
+                                               ast_log(LOG_WARNING, "Got G.719 offer at %u bps, but only 64000 bps supported; ignoring.\n", bit_rate);
                                                ast_rtp_codecs_payloads_unset(newaudiortp, NULL, codec);
                                        } else {
                                                found = TRUE;
@@ -10142,7 +10142,7 @@ static int process_sdp_a_audio(const char *a, struct sip_pvt *p, struct ast_rtp_
 static int process_sdp_a_video(const char *a, struct sip_pvt *p, struct ast_rtp_codecs *newvideortp, int *last_rtpmap_codec)
 {
        int found = FALSE;
-       int codec;
+       unsigned int codec;
        char mimeSubtype[128];
        unsigned int sample_rate;
        int debug = sip_debug_test_pvt(p);
@@ -10154,19 +10154,19 @@ static int process_sdp_a_video(const char *a, struct sip_pvt *p, struct ast_rtp_
                        if (!strncasecmp(mimeSubtype, "H26", 3) || !strncasecmp(mimeSubtype, "MP4", 3)) {
                                if (!(ast_rtp_codecs_payloads_set_rtpmap_type_rate(newvideortp, NULL, codec, "video", mimeSubtype, 0, sample_rate))) {
                                        if (debug)
-                                               ast_verbose("Found video description format %s for ID %d\n", mimeSubtype, codec);
+                                               ast_verbose("Found video description format %s for ID %u\n", mimeSubtype, codec);
                                        //found_rtpmap_codecs[last_rtpmap_codec] = codec;
                                        (*last_rtpmap_codec)++;
                                        found = TRUE;
                                } else {
                                        ast_rtp_codecs_payloads_unset(newvideortp, NULL, codec);
                                        if (debug)
-                                               ast_verbose("Found unknown media description format %s for ID %d\n", mimeSubtype, codec);
+                                               ast_verbose("Found unknown media description format %s for ID %u\n", mimeSubtype, codec);
                                }
                        }
                } else {
                        if (debug)
-                               ast_verbose("Discarded description format %s for ID %d\n", mimeSubtype, codec);
+                               ast_verbose("Discarded description format %s for ID %u\n", mimeSubtype, codec);
                }
        }
 
@@ -10176,7 +10176,7 @@ static int process_sdp_a_video(const char *a, struct sip_pvt *p, struct ast_rtp_
 static int process_sdp_a_text(const char *a, struct sip_pvt *p, struct ast_rtp_codecs *newtextrtp, char *red_fmtp, int *red_num_gen, int *red_data_pt, int *last_rtpmap_codec)
 {
        int found = FALSE;
-       int codec;
+       unsigned int codec;
        char mimeSubtype[128];
        unsigned int sample_rate;
        char *red_cp;
@@ -10194,25 +10194,25 @@ static int process_sdp_a_text(const char *a, struct sip_pvt *p, struct ast_rtp_c
                        } else if (!strncasecmp(mimeSubtype, "RED", 3)) { /* Text with Redudancy */
                                if (p->trtp) {
                                        ast_rtp_codecs_payloads_set_rtpmap_type_rate(newtextrtp, NULL, codec, "text", mimeSubtype, 0, sample_rate);
-                                       sprintf(red_fmtp, "fmtp:%d ", codec);
+                                       sprintf(red_fmtp, "fmtp:%u ", codec);
                                        if (debug)
-                                               ast_verbose("RED submimetype has payload type: %d\n", codec);
+                                               ast_verbose("RED submimetype has payload type: %u\n", codec);
                                        found = TRUE;
                                }
                        }
                } else {
                        if (debug)
-                               ast_verbose("Discarded description format %s for ID %d\n", mimeSubtype, codec);
+                               ast_verbose("Discarded description format %s for ID %u\n", mimeSubtype, codec);
                }
        } else if (!strncmp(a, red_fmtp, strlen(red_fmtp))) {
                /* count numbers of generations in fmtp */
                red_cp = &red_fmtp[strlen(red_fmtp)];
                strncpy(red_fmtp, a, 100);
 
-               sscanf(red_cp, "%30u", &red_data_pt[*red_num_gen]);
+               sscanf(red_cp, "%30u", (unsigned *)&red_data_pt[*red_num_gen]);
                red_cp = strtok(red_cp, "/");
                while (red_cp && (*red_num_gen)++ < AST_RED_MAX_GENERATION) {
-                       sscanf(red_cp, "%30u", &red_data_pt[*red_num_gen]);
+                       sscanf(red_cp, "%30u", (unsigned *)&red_data_pt[*red_num_gen]);
                        red_cp = strtok(NULL, "/");
                }
                red_cp = red_fmtp;
@@ -10244,10 +10244,10 @@ static int process_sdp_a_image(const char *a, struct sip_pvt *p)
        }
 
        if ((sscanf(attrib, "t38faxmaxbuffer:%30u", &x) == 1)) {
-               ast_debug(3, "MaxBufferSize:%d\n", x);
+               ast_debug(3, "MaxBufferSize:%u\n", x);
                found = TRUE;
        } else if ((sscanf(attrib, "t38maxbitrate:%30u", &x) == 1) || (sscanf(attrib, "t38faxmaxrate:%30u", &x) == 1)) {
-               ast_debug(3, "T38MaxBitRate: %d\n", x);
+               ast_debug(3, "T38MaxBitRate: %u\n", x);
                switch (x) {
                case 14400:
                        p->t38.their_parms.rate = AST_T38_RATE_14400;
@@ -10276,7 +10276,7 @@ static int process_sdp_a_image(const char *a, struct sip_pvt *p)
        } else if ((sscanf(attrib, "t38faxmaxdatagram:%30u", &x) == 1) || (sscanf(attrib, "t38maxdatagram:%30u", &x) == 1)) {
                /* override the supplied value if the configuration requests it */
                if (((signed int) p->t38_maxdatagram >= 0) && ((unsigned int) p->t38_maxdatagram > x)) {
-                       ast_debug(1, "Overriding T38FaxMaxDatagram '%d' with '%d'\n", x, p->t38_maxdatagram);
+                       ast_debug(1, "Overriding T38FaxMaxDatagram '%u' with '%u'\n", x, p->t38_maxdatagram);
                        x = p->t38_maxdatagram;
                }
                ast_debug(3, "FaxMaxDatagram: %u\n", x);
@@ -10284,7 +10284,7 @@ static int process_sdp_a_image(const char *a, struct sip_pvt *p)
                found = TRUE;
        } else if ((strncmp(attrib, "t38faxfillbitremoval", 20) == 0)) {
                if (sscanf(attrib, "t38faxfillbitremoval:%30u", &x) == 1) {
-                       ast_debug(3, "FillBitRemoval: %d\n", x);
+                       ast_debug(3, "FillBitRemoval: %u\n", x);
                        if (x == 1) {
                                p->t38.their_parms.fill_bit_removal = TRUE;
                        }
@@ -10295,7 +10295,7 @@ static int process_sdp_a_image(const char *a, struct sip_pvt *p)
                found = TRUE;
        } else if ((strncmp(attrib, "t38faxtranscodingmmr", 20) == 0)) {
                if (sscanf(attrib, "t38faxtranscodingmmr:%30u", &x) == 1) {
-                       ast_debug(3, "Transcoding MMR: %d\n", x);
+                       ast_debug(3, "Transcoding MMR: %u\n", x);
                        if (x == 1) {
                                p->t38.their_parms.transcoding_mmr = TRUE;
                        }
@@ -10306,7 +10306,7 @@ static int process_sdp_a_image(const char *a, struct sip_pvt *p)
                found = TRUE;
        } else if ((strncmp(attrib, "t38faxtranscodingjbig", 21) == 0)) {
                if (sscanf(attrib, "t38faxtranscodingjbig:%30u", &x) == 1) {
-                       ast_debug(3, "Transcoding JBIG: %d\n", x);
+                       ast_debug(3, "Transcoding JBIG: %u\n", x);
                        if (x == 1) {
                                p->t38.their_parms.transcoding_jbig = TRUE;
                        }
@@ -10399,7 +10399,7 @@ static int finalize_content(struct sip_request *req)
                return -1;
        }
 
-       snprintf(clen, sizeof(clen), "%zd", ast_str_strlen(req->content));
+       snprintf(clen, sizeof(clen), "%zu", ast_str_strlen(req->content));
        add_header(req, "Content-Length", clen);
 
        if (ast_str_strlen(req->content)) {
@@ -11526,7 +11526,7 @@ static void add_codec_to_sdp(const struct sip_pvt *p, format_t codec,
 
 
        if (debug)
-               ast_verbose("Adding codec 0x%" PRIx64 " (%s) to SDP\n", codec, ast_getformatname(codec));
+               ast_verbose("Adding codec 0x%" PRIx64 " (%s) to SDP\n", (long unsigned)codec, ast_getformatname(codec));
        if ((rtp_code = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(p->rtp), 1, codec)) == -1)
                return;
 
@@ -11536,7 +11536,7 @@ static void add_codec_to_sdp(const struct sip_pvt *p, format_t codec,
        } else /* I don't see how you couldn't have p->rtp, but good to check for and error out if not there like earlier code */
                return;
        ast_str_append(m_buf, 0, " %d", rtp_code);
-       ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%d\r\n", rtp_code,
+       ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%u\r\n", rtp_code,
                       ast_rtp_lookup_mime_subtype2(1, codec,
                                                   ast_test_flag(&p->flags[0], SIP_G726_NONSTANDARD) ? AST_RTP_OPT_G726_NONSTANDARD : 0),
                       ast_rtp_lookup_sample_rate2(1, codec));
@@ -11588,13 +11588,13 @@ static void add_vcodec_to_sdp(const struct sip_pvt *p, format_t codec,
                return;
 
        if (debug)
-               ast_verbose("Adding video codec 0x%" PRIx64 " (%s) to SDP\n", codec, ast_getformatname(codec));
+               ast_verbose("Adding video codec 0x%" PRIx64 " (%s) to SDP\n", (long unsigned)codec, ast_getformatname(codec));
 
        if ((rtp_code = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(p->vrtp), 1, codec)) == -1)
                return;
 
        ast_str_append(m_buf, 0, " %d", rtp_code);
-       ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%d\r\n", rtp_code,
+       ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%u\r\n", rtp_code,
                       ast_rtp_lookup_mime_subtype2(1, codec, 0),
                       ast_rtp_lookup_sample_rate2(1, codec));
        /* Add fmtp code here */
@@ -11611,13 +11611,13 @@ static void add_tcodec_to_sdp(const struct sip_pvt *p, int codec,
                return;
 
        if (debug)
-               ast_verbose("Adding text codec 0x%x (%s) to SDP\n", codec, ast_getformatname(codec));
+               ast_verbose("Adding text codec 0x%x (%s) to SDP\n", (unsigned)codec, ast_getformatname(codec));
 
        if ((rtp_code = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(p->trtp), 1, codec)) == -1)
                return;
 
        ast_str_append(m_buf, 0, " %d", rtp_code);
-       ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%d\r\n", rtp_code,
+       ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%u\r\n", rtp_code,
                       ast_rtp_lookup_mime_subtype2(1, codec, 0),
                       ast_rtp_lookup_sample_rate2(1, codec));
        /* Add fmtp code here */
@@ -11662,12 +11662,12 @@ static void add_noncodec_to_sdp(const struct sip_pvt *p, int format,
        int rtp_code;
 
        if (debug)
-               ast_verbose("Adding non-codec 0x%x (%s) to SDP\n", format, ast_rtp_lookup_mime_subtype2(0, format, 0));
+               ast_verbose("Adding non-codec 0x%x (%s) to SDP\n", (unsigned)format, ast_rtp_lookup_mime_subtype2(0, format, 0));
        if ((rtp_code = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(p->rtp), 0, format)) == -1)
                return;
 
        ast_str_append(m_buf, 0, " %d", rtp_code);
-       ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%d\r\n", rtp_code,
+       ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%u\r\n", rtp_code,
                       ast_rtp_lookup_mime_subtype2(0, format, 0),
                       ast_rtp_lookup_sample_rate2(0, format));
        if (format == AST_RTP_DTMF)     /* Indicate we support DTMF and FLASH... */
@@ -12074,8 +12074,8 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
                                        "IP6" : "IP4", ast_sockaddr_stringify_addr_remote(&udptldest));
                }
 
-               ast_str_append(&a_modem, 0, "a=T38FaxVersion:%d\r\n", p->t38.our_parms.version);
-               ast_str_append(&a_modem, 0, "a=T38MaxBitRate:%d\r\n", t38_get_rate(p->t38.our_parms.rate));
+               ast_str_append(&a_modem, 0, "a=T38FaxVersion:%u\r\n", p->t38.our_parms.version);
+               ast_str_append(&a_modem, 0, "a=T38MaxBitRate:%u\r\n", t38_get_rate(p->t38.our_parms.rate));
                if (p->t38.our_parms.fill_bit_removal) {
                        ast_str_append(&a_modem, 0, "a=T38FaxFillBitRemoval\r\n");
                }
@@ -12865,7 +12865,7 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init,
        if (sdp) {
                memset(p->offered_media, 0, sizeof(p->offered_media));
                if (p->udptl && p->t38.state == T38_LOCAL_REINVITE) {
-                       ast_debug(1, "T38 is in state %d on channel %s\n", p->t38.state, p->owner ? p->owner->name : "<none>");
+                       ast_debug(1, "T38 is in state %u on channel %s\n", p->t38.state, p->owner ? p->owner->name : "<none>");
                        add_sdp(&req, p, FALSE, FALSE, TRUE);
                } else if (p->rtp) {
                        try_suggested_sip_codec(p);
@@ -13331,7 +13331,7 @@ static int transmit_cc_notify(struct ast_cc_agent *agent, struct sip_pvt *subscr
        char subscription_state_hdr[64];
 
        if (state < CC_QUEUED || state > CC_READY) {
-               ast_log(LOG_WARNING, "Invalid state provided for transmit_cc_notify (%d)\n", state);
+               ast_log(LOG_WARNING, "Invalid state provided for transmit_cc_notify (%u)\n", state);
                return -1;
        }
 
@@ -14273,7 +14273,7 @@ static void auth_headers(enum sip_auth_type code, char **header, char **resphead
                *header = "Proxy-Authenticate";
                *respheader = "Proxy-Authorization";
        } else {
-               ast_verbose("-- wrong response code %d\n", code);
+               ast_verbose("-- wrong response code %u\n", code);
                *header = *respheader = "Invalid";
        }
 }
@@ -14954,7 +14954,7 @@ static void build_route(struct sip_pvt *p, struct sip_request *req, int backward
 static void set_nonce_randdata(struct sip_pvt *p, int forceupdate)
 {
        if (p->stalenonce || forceupdate || ast_strlen_zero(p->randdata)) {
-               ast_string_field_build(p, randdata, "%08lx", ast_random());     /* Create nonce for challenge */
+               ast_string_field_build(p, randdata, "%08lx", (unsigned long)ast_random());      /* Create nonce for challenge */
                p->stalenonce = 0;
        }
 }
@@ -18288,7 +18288,7 @@ static char *_sip_show_peer(int type, int fd, struct mansession *s, const struct
                ast_cli(fd, "  DirectMedACL : %s\n", AST_CLI_YESNO(peer->directmediaha != NULL));
                ast_cli(fd, "  T.38 support : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[1], SIP_PAGE2_T38SUPPORT)));
                ast_cli(fd, "  T.38 EC mode : %s\n", faxec2str(ast_test_flag(&peer->flags[1], SIP_PAGE2_T38SUPPORT)));
-               ast_cli(fd, "  T.38 MaxDtgrm: %d\n", peer->t38_maxdatagram);
+               ast_cli(fd, "  T.38 MaxDtgrm: %u\n", peer->t38_maxdatagram);
                ast_cli(fd, "  DirectMedia  : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[0], SIP_DIRECT_MEDIA)));
                ast_cli(fd, "  PromiscRedir : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[0], SIP_PROMISCREDIR)));
                ast_cli(fd, "  User=Phone   : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[0], SIP_USEREQPHONE)));
@@ -18406,7 +18406,7 @@ static char *_sip_show_peer(int type, int fd, struct mansession *s, const struct
                astman_append(s, "SIP-TextSupport: %s\r\n", (ast_test_flag(&peer->flags[1], SIP_PAGE2_TEXTSUPPORT)?"Y":"N"));
                astman_append(s, "SIP-T.38Support: %s\r\n", (ast_test_flag(&peer->flags[1], SIP_PAGE2_T38SUPPORT)?"Y":"N"));
                astman_append(s, "SIP-T.38EC: %s\r\n", faxec2str(ast_test_flag(&peer->flags[1], SIP_PAGE2_T38SUPPORT)));
-               astman_append(s, "SIP-T.38MaxDtgrm: %d\r\n", peer->t38_maxdatagram);
+               astman_append(s, "SIP-T.38MaxDtgrm: %u\r\n", peer->t38_maxdatagram);
                astman_append(s, "SIP-Sess-Timers: %s\r\n", stmode2str(peer->stimer.st_mode_oper));
                astman_append(s, "SIP-Sess-Refresh: %s\r\n", strefresherparam2str(peer->stimer.st_ref));
                astman_append(s, "SIP-Sess-Expires: %d\r\n", peer->stimer.st_max_se);
@@ -18908,7 +18908,7 @@ static char *sip_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_
 
        ast_cli(a->fd, "  T.38 support:           %s\n", AST_CLI_YESNO(ast_test_flag(&global_flags[1], SIP_PAGE2_T38SUPPORT)));
        ast_cli(a->fd, "  T.38 EC mode:           %s\n", faxec2str(ast_test_flag(&global_flags[1], SIP_PAGE2_T38SUPPORT)));
-       ast_cli(a->fd, "  T.38 MaxDtgrm:          %d\n", global_t38_maxdatagram);
+       ast_cli(a->fd, "  T.38 MaxDtgrm:          %u\n", global_t38_maxdatagram);
        if (!realtimepeers && !realtimeregs)
                ast_cli(a->fd, "  SIP realtime:           Disabled\n" );
        else
@@ -18922,10 +18922,10 @@ static char *sip_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_
        ast_cli(a->fd, "  IP ToS RTP audio:       %s\n", ast_tos2str(global_tos_audio));
        ast_cli(a->fd, "  IP ToS RTP video:       %s\n", ast_tos2str(global_tos_video));
        ast_cli(a->fd, "  IP ToS RTP text:        %s\n", ast_tos2str(global_tos_text));
-       ast_cli(a->fd, "  802.1p CoS SIP:         %d\n", global_cos_sip);
-       ast_cli(a->fd, "  802.1p CoS RTP audio:   %d\n", global_cos_audio);
-       ast_cli(a->fd, "  802.1p CoS RTP video:   %d\n", global_cos_video);
-       ast_cli(a->fd, "  802.1p CoS RTP text:    %d\n", global_cos_text);
+       ast_cli(a->fd, "  802.1p CoS SIP:         %u\n", global_cos_sip);
+       ast_cli(a->fd, "  802.1p CoS RTP audio:   %u\n", global_cos_audio);
+       ast_cli(a->fd, "  802.1p CoS RTP video:   %u\n", global_cos_video);
+       ast_cli(a->fd, "  802.1p CoS RTP text:    %u\n", global_cos_text);
        ast_cli(a->fd, "  Jitterbuffer enabled:   %s\n", AST_CLI_YESNO(ast_test_flag(&global_jbconf, AST_JB_ENABLED)));
        if (ast_test_flag(&global_jbconf, AST_JB_ENABLED)) {
                ast_cli(a->fd, "  Jitterbuffer forced:    %s\n", AST_CLI_YESNO(ast_test_flag(&global_jbconf, AST_JB_FORCED)));
@@ -20055,7 +20055,7 @@ static int build_reply_digest(struct sip_pvt *p, int method, char* digest, int d
        else
                snprintf(uri, sizeof(uri), "%s:%s@%s", p->socket.type == SIP_TRANSPORT_TLS ? "sips" : "sip", p->username, ast_sockaddr_stringify_host_remote(&p->sa));
 
-       snprintf(cnonce, sizeof(cnonce), "%08lx", ast_random());
+       snprintf(cnonce, sizeof(cnonce), "%08lx", (unsigned long)ast_random());
 
        /* Check if we have peer credentials */
        ao2_lock(p);
@@ -20113,7 +20113,7 @@ static int build_reply_digest(struct sip_pvt *p, int method, char* digest, int d
 
        p->noncecount++;
        if (!ast_strlen_zero(p->qop))
-               snprintf(resp, sizeof(resp), "%s:%s:%08x:%s:%s:%s", a1_hash, p->nonce, p->noncecount, cnonce, "auth", a2_hash);
+               snprintf(resp, sizeof(resp), "%s:%s:%08x:%s:%s:%s", a1_hash, p->nonce, (unsigned)p->noncecount, cnonce, "auth", a2_hash);
        else
                snprintf(resp, sizeof(resp), "%s:%s:%s", a1_hash, p->nonce, a2_hash);
        ast_md5_hash(resp_hash, resp);
@@ -20125,7 +20125,7 @@ static int build_reply_digest(struct sip_pvt *p, int method, char* digest, int d
 
        /* XXX We hard code our qop to "auth" for now.  XXX */
        if (!ast_strlen_zero(p->qop))
-               snprintf(digest, digest_len, "Digest username=\"%s\", realm=\"%s\", algorithm=MD5, uri=\"%s\", nonce=\"%s\", response=\"%s\"%s, qop=auth, cnonce=\"%s\", nc=%08x", username, p->realm, uri, p->nonce, resp_hash, opaque, cnonce, p->noncecount);
+               snprintf(digest, digest_len, "Digest username=\"%s\", realm=\"%s\", algorithm=MD5, uri=\"%s\", nonce=\"%s\", response=\"%s\"%s, qop=auth, cnonce=\"%s\", nc=%08x", username, p->realm, uri, p->nonce, resp_hash, opaque, cnonce, (unsigned)p->noncecount);
        else
                snprintf(digest, digest_len, "Digest username=\"%s\", realm=\"%s\", algorithm=MD5, uri=\"%s\", nonce=\"%s\", response=\"%s\"%s", username, p->realm, uri, p->nonce, resp_hash, opaque);
 
@@ -20282,7 +20282,7 @@ static int function_sippeer(struct ast_channel *chan, const char *cmd, char *dat
        } else  if (!strcasecmp(colname, "codecs")) {
                ast_getformatname_multiple(buf, len -1, peer->capability);
        } else if (!strcasecmp(colname, "encryption")) {
-               snprintf(buf, len, "%d", ast_test_flag(&peer->flags[1], SIP_PAGE2_USE_SRTP));
+               snprintf(buf, len, "%u", ast_test_flag(&peer->flags[1], SIP_PAGE2_USE_SRTP));
        } else  if (!strncasecmp(colname, "chanvar[", 8)) {
                char *chanvar=colname + 8;
                struct ast_variable *v;
@@ -23171,7 +23171,7 @@ static int handle_request_invite_st(struct sip_pvt *p, struct sip_request *req,
                        break;
 
                default:
-                       ast_log(LOG_ERROR, "Internal Error %d at %s:%d\n", st_get_mode(p, 1), __FILE__, __LINE__);
+                       ast_log(LOG_ERROR, "Internal Error %u at %s:%d\n", st_get_mode(p, 1), __FILE__, __LINE__);
                        break;
                }
        } else {
@@ -23933,7 +23933,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
                        p->invitestate = INV_TERMINATED;
                        break;
                default:
-                       ast_log(LOG_WARNING, "Don't know how to handle INVITE in state %d\n", c->_state);
+                       ast_log(LOG_WARNING, "Don't know how to handle INVITE in state %u\n", c->_state);
                        transmit_response(p, "100 Trying", req);
                        break;
                }
@@ -26015,7 +26015,7 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct as
         */                     
        
        p->method = req->method;        /* Find out which SIP method they are using */
-       ast_debug(4, "**** Received %s (%d) - Command in SIP %s\n", sip_methods[p->method].text, sip_methods[p->method].id, cmd);
+       ast_debug(4, "**** Received %s (%u) - Command in SIP %s\n", sip_methods[p->method].text, sip_methods[p->method].id, cmd);
 
        if (p->icseq && (p->icseq > seqno) ) {
                if (p->pendinginvite && seqno == p->pendinginvite && (req->method == SIP_ACK || req->method == SIP_CANCEL)) {
@@ -27626,7 +27626,7 @@ static void set_insecure_flags (struct ast_flags *flags, const char *value, int
   \returns non-zero if any config options were handled, zero otherwise
 */
 static int handle_t38_options(struct ast_flags *flags, struct ast_flags *mask, struct ast_variable *v,
-                             int *maxdatagram)
+                             unsigned int *maxdatagram)
 {
        int res = 1;
 
index 0b16a34edef5b33ac72e7e3f78c397f0637455c9..8691212fb8405838970ececb3ed53cc8de63af70 100644 (file)
@@ -3992,7 +3992,7 @@ static int skinny_hangup(struct ast_channel *ast)
        }
 
        if (skinnydebug)
-               ast_verb(3,"Hanging up %s/%d\n",d->name,sub->callid);
+               ast_verb(3,"Hanging up %s/%u\n", d->name, sub->callid);
 
        AST_LIST_REMOVE(&l->sub, sub, list);
 
@@ -4005,7 +4005,7 @@ static int skinny_hangup(struct ast_channel *ast)
 
                        }
                        if (sub == l->activesub) {      /* we are killing the active sub, but there are other subs on the line*/
-                               ast_verb(4,"Killing active sub %d\n", sub->callid);
+                               ast_verb(4,"Killing active sub %u\n", sub->callid);
                                if (sub->related) {
                                        l->activesub = sub->related;
                                } else {
@@ -4022,7 +4022,7 @@ static int skinny_hangup(struct ast_channel *ast)
                                transmit_lamp_indication(d, STIMULUS_LINE, l->instance, SKINNY_LAMP_BLINK);
                                transmit_stop_tone(d, l->instance, sub->callid);
                        } else {    /* we are killing a background sub on the line with other subs*/
-                               ast_verb(4,"Killing inactive sub %d\n", sub->callid);
+                               ast_verb(4,"Killing inactive sub %u\n", sub->callid);
                                if (AST_LIST_NEXT(sub, list)) {
                                        transmit_lamp_indication(d, STIMULUS_LINE, l->instance, SKINNY_LAMP_BLINK);
                                } else {
@@ -4030,7 +4030,7 @@ static int skinny_hangup(struct ast_channel *ast)
                                }
                        }
                } else {                                                /* no more subs on line so make idle */
-                       ast_verb(4,"Killing only sub %d\n", sub->callid);
+                       ast_verb(4,"Killing only sub %u\n", sub->callid);
                        l->hookstate = SKINNY_ONHOOK;
                        transmit_closereceivechannel(d, sub);
                        transmit_stopmediatransmission(d, sub);
@@ -4077,7 +4077,7 @@ static int skinny_answer(struct ast_channel *ast)
 
        if (sub->blindxfer) {
                if (skinnydebug)
-                       ast_debug(1, "skinny_answer(%s) on %s@%s-%d with BlindXFER, transferring\n",
+                       ast_debug(1, "skinny_answer(%s) on %s@%s-%u with BlindXFER, transferring\n",
                                ast->name, l->name, d->name, sub->callid);
                ast_setstate(ast, AST_STATE_UP);
                skinny_transfer(sub);
@@ -4089,7 +4089,7 @@ static int skinny_answer(struct ast_channel *ast)
                start_rtp(sub);
        }
        if (skinnydebug)
-               ast_verb(1, "skinny_answer(%s) on %s@%s-%d\n", ast->name, l->name, d->name, sub->callid);
+               ast_verb(1, "skinny_answer(%s) on %s@%s-%u\n", ast->name, l->name, d->name, sub->callid);
        if (ast->_state != AST_STATE_UP) {
                ast_setstate(ast, AST_STATE_UP);
        }
@@ -4176,7 +4176,7 @@ static int skinny_write(struct ast_channel *ast, struct ast_frame *frame)
                if (frame->frametype == AST_FRAME_IMAGE) {
                        return 0;
                } else {
-                       ast_log(LOG_WARNING, "Can't send %d type frames with skinny_write\n", frame->frametype);
+                       ast_log(LOG_WARNING, "Can't send %u type frames with skinny_write\n", frame->frametype);
                        return 0;
                }
        } else {
@@ -5498,7 +5498,7 @@ static int handle_onhook_message(struct skinny_req *req, struct skinnysession *s
                        sub->alreadygone = 1;
                        ast_queue_hangup(sub->owner);
                } else {
-                       ast_log(LOG_WARNING, "Skinny(%s@%s-%d) channel already destroyed\n",
+                       ast_log(LOG_WARNING, "Skinny(%s@%s-%u) channel already destroyed\n",
                                l->name, d->name, sub->callid);
                }
                /* Not ideal, but let's send updated time at onhook and offhook, as it clears the display */
@@ -5903,7 +5903,7 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                                l->hookstate = SKINNY_OFFHOOK;
                                transmit_speaker_mode(d, SKINNY_SPEAKERON);
                        }
-                       ast_verb(1, "Call-id: %d\n", sub->callid);
+                       ast_verb(1, "Call-id: %u\n", sub->callid);
 
                        transmit_callstate(d, l->instance, sub->callid, SKINNY_OFFHOOK);
                        transmit_activatecallplane(d, l);
@@ -6068,7 +6068,7 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                                        sub->alreadygone = 1;
                                        ast_queue_hangup(sub->owner);
                                } else {
-                                       ast_log(LOG_WARNING, "Skinny(%s@%s-%d) channel already destroyed\n",
+                                       ast_log(LOG_WARNING, "Skinny(%s@%s-%u) channel already destroyed\n",
                                                l->name, d->name, sub->callid);
                                }
                        }
@@ -6214,7 +6214,7 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
                int callReference;
 
                if (skinnydebug)
-                       ast_verb(1, "Collected digit: [%d]\n", letohl(req->data.keypad.button));
+                       ast_verb(1, "Collected digit: [%u]\n", letohl(req->data.keypad.button));
 
                lineInstance = letohl(req->data.keypad.lineInstance);
                callReference = letohl(req->data.keypad.callReference);
@@ -6351,7 +6351,7 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
                break;
        default:
                if (skinnydebug)
-                       ast_verb(1, "RECEIVED UNKNOWN MESSAGE TYPE:  %x\n", letohl(req->e));
+                       ast_verb(1, "RECEIVED UNKNOWN MESSAGE TYPE:  %x\n", (unsigned)letohl(req->e));
                break;
        }
        if (res >= 0 && req)
index e1b905430ce4e45851f7eb6f109dc75c141d9ab1..9b42b2a4c3b324227bf673e49d9b23e7774cdc2b 100644 (file)
@@ -729,7 +729,7 @@ static void display_last_error(const char *sz_msg)
        time(&cur_time);
 
        /* Display the error message */
-       ast_log(LOG_WARNING, "%s %s : (%u) %s\n", ctime(&cur_time), sz_msg, errno,
+       ast_log(LOG_WARNING, "%s %s : (%d) %s\n", ctime(&cur_time), sz_msg, errno,
                        strerror(errno));
 }
 
@@ -821,7 +821,7 @@ static void send_client(int size, const unsigned char *data, struct unistimsessi
 
 /*#ifdef DUMP_PACKET */
        if (unistimdebug)
-               ast_verb(6, "Sending datas with seq #0x%.4x Using slot #%d :\n", pte->seq_server, buf_pos);
+               ast_verb(6, "Sending datas with seq #0x%.4x Using slot #%d :\n", (unsigned)pte->seq_server, buf_pos);
 /*#endif */
        send_raw_client(pte->wsabufsend[buf_pos].len, pte->wsabufsend[buf_pos].buf, &(pte->sin),
                                  &(pte->sout));
@@ -973,7 +973,7 @@ static void Sendicon(unsigned char pos, unsigned char status, struct unistimsess
 {
        BUFFSEND;
        if (unistimdebug)
-               ast_verb(0, "Sending icon pos %d with status 0x%.2x\n", pos, status);
+               ast_verb(0, "Sending icon pos %d with status 0x%.2x\n", pos, (unsigned)status);
        memcpy(buffsend + SIZE_HEADER, packet_send_icon, sizeof(packet_send_icon));
        buffsend[9] = pos;
        buffsend[10] = status;
@@ -1041,7 +1041,7 @@ send_favorite(unsigned char pos, unsigned char status, struct unistimsession *pt
        int i;
 
        if (unistimdebug)
-               ast_verb(0, "Sending favorite pos %d with status 0x%.2x\n", pos, status);
+               ast_verb(0, "Sending favorite pos %d with status 0x%.2x\n", pos, (unsigned)status);
        memcpy(buffsend + SIZE_HEADER, packet_send_favorite, sizeof(packet_send_favorite));
        buffsend[10] = pos;
        buffsend[24] = pos;
@@ -1186,7 +1186,7 @@ static int send_retransmit(struct unistimsession *pte)
                if (i < 0) {
                        ast_log(LOG_WARNING,
                                        "Asked to retransmit an ACKed slot ! last_buf_available=%d, seq_server = #0x%.4x last_seq_ack = #0x%.4x\n",
-                                       pte->last_buf_available, pte->seq_server, pte->last_seq_ack);
+                                       pte->last_buf_available, (unsigned)pte->seq_server, (unsigned)pte->last_seq_ack);
                        continue;
                }
 
@@ -1196,7 +1196,7 @@ static int send_retransmit(struct unistimsession *pte)
 
                        seq = ntohs(sbuf[1]);
                        ast_verb(0, "Retransmit slot #%d (seq=#0x%.4x), last ack was #0x%.4x\n", i,
-                                               seq, pte->last_seq_ack);
+                                               (unsigned)seq, (unsigned)pte->last_seq_ack);
                }
                send_raw_client(pte->wsabufsend[i].len, pte->wsabufsend[i].buf, &pte->sin,
                                          &pte->sout);
@@ -1266,7 +1266,7 @@ static void send_led_update(struct unistimsession *pte, unsigned char led)
 {
        BUFFSEND;
        if (unistimdebug)
-               ast_verb(0, "Sending led_update (%x)\n", led);
+               ast_verb(0, "Sending led_update (%x)\n", (unsigned)led);
        memcpy(buffsend + SIZE_HEADER, packet_send_led_update, sizeof(packet_send_led_update));
        buffsend[9] = led;
        send_client(SIZE_HEADER + sizeof(packet_send_led_update), buffsend, pte);
@@ -1281,8 +1281,8 @@ send_select_output(struct unistimsession *pte, unsigned char output, unsigned ch
 {
        BUFFSEND;
        if (unistimdebug)
-               ast_verb(0, "Sending select output packet output=%x volume=%x mute=%x\n", output,
-                                       volume, mute);
+               ast_verb(0, "Sending select output packet output=%x volume=%x mute=%x\n", (unsigned)output,
+                                       (unsigned)volume, (unsigned)mute);
        memcpy(buffsend + SIZE_HEADER, packet_send_select_output,
                   sizeof(packet_send_select_output));
        buffsend[9] = output;
@@ -1527,7 +1527,7 @@ static void rcv_mac_addr(struct unistimsession *pte, const unsigned char *buf)
        char addrmac[19];
        int res = 0;
        for (tmp = 15; tmp < 15 + SIZE_HEADER; tmp++) {
-               sprintf(&addrmac[i], "%.2x", (unsigned char) buf[tmp]);
+               sprintf(&addrmac[i], "%.2x", (unsigned) buf[tmp]);
                i += 2;
        }
        if (unistimdebug) {
@@ -1614,7 +1614,7 @@ static void rcv_mac_addr(struct unistimsession *pte, const unsigned char *buf)
                                        "Autoprovisioning with database is not yet functional\n");
                        break;
                default:
-                       ast_log(LOG_WARNING, "Internal error : unknown autoprovisioning value = %d\n",
+                       ast_log(LOG_WARNING, "Internal error : unknown autoprovisioning value = %u\n",
                                        autoprovisioning);
                }
        }
@@ -1649,7 +1649,7 @@ static void rcv_mac_addr(struct unistimsession *pte, const unsigned char *buf)
                        pte->state = STATE_MAINPAGE;
                        break;
                default:
-                       ast_log(LOG_WARNING, "Internal error, extension value unknown : %d\n",
+                       ast_log(LOG_WARNING, "Internal error, extension value unknown : %u\n",
                                        pte->device->extension);
                        pte->state = STATE_AUTHDENY;
                        break;
@@ -1983,7 +1983,7 @@ static void close_call(struct unistimsession *pte)
                        else
                                ast_log(LOG_WARNING, "threeway sub without owner\n");
                } else
-                       ast_verb(0, "USTM(%s@%s-%d) channel already destroyed\n", sub->parent->name,
+                       ast_verb(0, "USTM(%s@%s-%u) channel already destroyed\n", sub->parent->name,
                                                sub->parent->parent->name, sub->subtype);
        }
        change_callerid(pte, 0, pte->device->redial_number);
@@ -2008,7 +2008,7 @@ static void *unistim_ss(void *data)
        struct unistimsession *s = l->parent->session;
        int res;
 
-       ast_verb(3, "Starting switch on '%s@%s-%d' to %s\n", l->name, l->parent->name, sub->subtype, s->device->phone_number);
+       ast_verb(3, "Starting switch on '%s@%s-%u' to %s\n", l->name, l->parent->name, sub->subtype, s->device->phone_number);
        ast_copy_string(chan->exten, s->device->phone_number, sizeof(chan->exten));
        ast_copy_string(s->device->redial_number, s->device->phone_number,
                                        sizeof(s->device->redial_number));
@@ -2459,7 +2459,7 @@ static void HandleCallOutgoing(struct unistimsession *s)
                                return;
                        }
                        if (unistimdebug)
-                               ast_verb(0, "Started three way call on channel %p (%s) subchan %d\n",
+                               ast_verb(0, "Started three way call on channel %p (%s) subchan %u\n",
                                         p->subs[SUB_THREEWAY]->owner, p->subs[SUB_THREEWAY]->owner->name,
                                         p->subs[SUB_THREEWAY]->subtype);
                } else
@@ -3429,7 +3429,7 @@ static void process_request(int size, unsigned char *buf, struct unistimsession
                char keycode = buf[13];
 
                if (unistimdebug)
-                       ast_verb(0, "Key pressed : keycode = 0x%.2x - current state : %d\n", keycode,
+                       ast_verb(0, "Key pressed : keycode = 0x%.2x - current state : %d\n", (unsigned)keycode,
                                                pte->state);
 
                switch (pte->state) {
@@ -3574,14 +3574,14 @@ static void parsing(int size, unsigned char *buf, struct unistimsession *pte,
        }
        if (buf[5] != 2) {
                ast_log(LOG_NOTICE, "%s Wrong direction : got 0x%.2x expected 0x02\n", tmpbuf,
-                               buf[5]);
+                               (unsigned)buf[5]);
                return;
        }
        seq = ntohs(sbuf[1]);
        if (buf[4] == 1) {
                ast_mutex_lock(&pte->lock);
                if (unistimdebug)
-                       ast_verb(6, "ACK received for packet #0x%.4x\n", seq);
+                       ast_verb(6, "ACK received for packet #0x%.4x\n", (unsigned)seq);
                pte->nb_retransmit = 0;
 
                if ((pte->last_seq_ack) + 1 == seq) {
@@ -3597,20 +3597,20 @@ static void parsing(int size, unsigned char *buf, struct unistimsession *pte,
                        } else
                                ast_log(LOG_NOTICE,
                                                "%s Warning : ACK received for an already ACKed packet : #0x%.4x we are at #0x%.4x\n",
-                                               tmpbuf, seq, pte->last_seq_ack);
+                                               tmpbuf, (unsigned)seq, (unsigned)pte->last_seq_ack);
                        ast_mutex_unlock(&pte->lock);
                        return;
                }
                if (pte->seq_server < seq) {
                        ast_log(LOG_NOTICE,
                                        "%s Error : ACK received for a non-existent packet : #0x%.4x\n",
-                                       tmpbuf, pte->seq_server);
+                                       tmpbuf, (unsigned)pte->seq_server);
                        ast_mutex_unlock(&pte->lock);
                        return;
                }
                if (unistimdebug)
                        ast_verb(0, "%s ACK gap : Received ACK #0x%.4x, previous was #0x%.4x\n",
-                                               tmpbuf, seq, pte->last_seq_ack);
+                                               tmpbuf, (unsigned)seq, (unsigned)pte->last_seq_ack);
                pte->last_seq_ack = seq;
                check_send_queue(pte);
                ast_mutex_unlock(&pte->lock);
@@ -3632,7 +3632,7 @@ static void parsing(int size, unsigned char *buf, struct unistimsession *pte,
                if (pte->seq_phone > seq) {
                        ast_log(LOG_NOTICE,
                                        "%s Warning : received a retransmitted packet : #0x%.4x (we are at #0x%.4x)\n",
-                                       tmpbuf, seq, pte->seq_phone);
+                                       tmpbuf, (unsigned)seq, (unsigned)pte->seq_phone);
                        /* BUG ? pte->device->seq_phone = seq; */
                        /* Send ACK */
                        buf[4] = 1;
@@ -3642,28 +3642,28 @@ static void parsing(int size, unsigned char *buf, struct unistimsession *pte,
                }
                ast_log(LOG_NOTICE,
                                "%s Warning : we lost a packet : received #0x%.4x (we are at #0x%.4x)\n",
-                               tmpbuf, seq, pte->seq_phone);
+                               tmpbuf, (unsigned)seq, (unsigned)pte->seq_phone);
                return;
        }
        if (buf[4] == 0) {
-               ast_log(LOG_NOTICE, "%s Retransmit request for packet #0x%.4x\n", tmpbuf, seq);
+               ast_log(LOG_NOTICE, "%s Retransmit request for packet #0x%.4x\n", tmpbuf, (unsigned)seq);
                if (pte->last_seq_ack > seq) {
                        ast_log(LOG_NOTICE,
                                        "%s Error : received a request for an already ACKed packet : #0x%.4x\n",
-                                       tmpbuf, pte->last_seq_ack);
+                                       tmpbuf, (unsigned)pte->last_seq_ack);
                        return;
                }
                if (pte->seq_server < seq) {
                        ast_log(LOG_NOTICE,
                                        "%s Error : received a request for a non-existent packet : #0x%.4x\n",
-                                       tmpbuf, pte->seq_server);
+                                       tmpbuf, (unsigned)pte->seq_server);
                        return;
                }
                send_retransmit(pte);
                return;
        }
        ast_log(LOG_NOTICE, "%s Unknown request : got 0x%.2x expected 0x00,0x01 or 0x02\n",
-                       tmpbuf, buf[4]);
+                       tmpbuf, (unsigned)buf[4]);
        return;
 }
 
@@ -3891,7 +3891,7 @@ static int unistim_answer(struct ast_channel *ast)
        if ((!sub->rtp) && (!l->subs[SUB_THREEWAY]))
                start_rtp(sub);
        if (unistimdebug)
-               ast_verb(0, "unistim_answer(%s) on %s@%s-%d\n", ast->name, l->name,
+               ast_verb(0, "unistim_answer(%s) on %s@%s-%u\n", ast->name, l->name,
                                        l->parent->name, sub->subtype);
        send_text(TEXT_LINE2, TEXT_NORMAL, l->parent->session, "is now on-line");
        if (l->subs[SUB_THREEWAY])
@@ -3975,7 +3975,7 @@ static struct ast_frame *unistim_rtp_read(const struct ast_channel *ast,
        }
 
        if (!sub->rtp) {
-               ast_log(LOG_WARNING, "RTP handle NULL while reading on subchannel %d\n",
+               ast_log(LOG_WARNING, "RTP handle NULL while reading on subchannel %u\n",
                                sub->subtype);
                return &ast_null_frame;
        }
@@ -4031,7 +4031,7 @@ static int unistim_write(struct ast_channel *ast, struct ast_frame *frame)
                if (frame->frametype == AST_FRAME_IMAGE)
                        return 0;
                else {
-                       ast_log(LOG_WARNING, "Can't send %d type frames with unistim_write\n",
+                       ast_log(LOG_WARNING, "Can't send %u type frames with unistim_write\n",
                                        frame->frametype);
                        return 0;
                }
@@ -4066,7 +4066,7 @@ static int unistim_fixup(struct ast_channel *oldchan, struct ast_channel *newcha
 
        ast_mutex_lock(&p->lock);
 
-       ast_debug(1, "New owner for channel USTM/%s@%s-%d is %s\n", l->name,
+       ast_debug(1, "New owner for channel USTM/%s@%s-%u is %s\n", l->name,
                        l->parent->name, p->subtype, newchan->name);
 
        if (p->owner != oldchan) {
@@ -4506,9 +4506,9 @@ static struct ast_channel *unistim_new(struct unistim_subchannel *sub, int state
        }
        l = sub->parent;
        tmp = ast_channel_alloc(1, state, l->cid_num, NULL, l->accountcode, l->exten,
-               l->context, linkedid, l->amaflags, "%s@%s-%d", l->name, l->parent->name, sub->subtype);
+               l->context, linkedid, l->amaflags, "%s@%s-%u", l->name, l->parent->name, sub->subtype);
        if (unistimdebug)
-               ast_verb(0, "unistim_new sub=%d (%p) chan=%p\n", sub->subtype, sub, tmp);
+               ast_verb(0, "unistim_new sub=%u (%p) chan=%p\n", sub->subtype, sub, tmp);
        if (!tmp) {
                ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
                return NULL;
@@ -4794,10 +4794,10 @@ static char *unistim_info(struct ast_cli_entry *e, int cmd, struct ast_cli_args
                                else
                                        tmp = sub->owner->_bridge;
                                if (sub->subtype != i)
-                                       ast_cli(a->fd, "Warning ! subchannel->subs[%d] have a subtype=%d\n", i,
+                                       ast_cli(a->fd, "Warning ! subchannel->subs[%d] have a subtype=%u\n", i,
                                                        sub->subtype);
                                ast_cli(a->fd,
-                                               "-->subtype=%d chan=%p rtp=%p bridge=%p line=%p alreadygone=%d\n",
+                                               "-->subtype=%u chan=%p rtp=%p bridge=%p line=%p alreadygone=%d\n",
                                                sub->subtype, sub->owner, sub->rtp, tmp, sub->parent,
                                                sub->alreadygone);
                        }
@@ -4810,7 +4810,7 @@ static char *unistim_info(struct ast_cli_entry *e, int cmd, struct ast_cli_args
        s = sessions;
        while (s) {
                ast_cli(a->fd,
-                               "sin=%s timeout=%u state=%d macaddr=%s device=%p session=%p\n",
+                               "sin=%s timeout=%d state=%d macaddr=%s device=%p session=%p\n",
                                ast_inet_ntoa(s->sin.sin_addr), s->timeout, s->state, s->macaddr,
                                s->device, s);
                s = s->next;
@@ -5045,7 +5045,7 @@ static int ParseBookmark(const char *text, struct unistim_device *d)
        ast_copy_string(d->softkeynumber[p], number, sizeof(d->softkeynumber[p]));
        if (unistimdebug)
                ast_verb(0, "New bookmark at pos %d label='%s' number='%s' icon=%x\n",
-                                       p, d->softkeylabel[p], d->softkeynumber[p], d->softkeyicon[p]);
+                                       p, d->softkeylabel[p], d->softkeynumber[p], (unsigned)d->softkeyicon[p]);
        return 1;
 }
 
index 7eadb115c82da974323ecc631da6c23ff8c221fd..14b676050a5daf0016bf5d995788d4e0978c48b4 100644 (file)
@@ -97,7 +97,7 @@ static void dump_string_hex(char *output, int maxlen, void *value, int len)
        int i = 0;
 
        while (len-- && (i + 1) * 4 < maxlen) {
-               sprintf(output + (4 * i), "\\x%2.2x", *((unsigned char *)value + i));
+               sprintf(output + (4 * i), "\\x%2.2x", (unsigned)*((unsigned char *)value + i));
                i++;
        }
 }
@@ -1121,7 +1121,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen)
                                ies->osptokenblock[count] = (char *)data + 2 + 1;
                                ies->ospblocklength[count] = len - 1;
                        } else {
-                               snprintf(tmp, (int)sizeof(tmp), "Expected OSP token block index to be 0~%d but was %d\n", IAX_MAX_OSPBLOCK_NUM - 1, count);
+                               snprintf(tmp, (int)sizeof(tmp), "Expected OSP token block index to be 0~%d but was %u\n", IAX_MAX_OSPBLOCK_NUM - 1, count);
                                errorf(tmp);
                        }
                        break;
index 4ef4bb987297af3a6391e8776560c1223acaedac..535362e9cdd683302a1e27c8c3f1a26ef9374df3 100644 (file)
@@ -332,7 +332,7 @@ static void analog_swap_subs(struct analog_pvt *p, enum analog_sub a, enum analo
        int tinthreeway;
        struct ast_channel *towner;
 
-       ast_debug(1, "Swapping %d and %d\n", a, b);
+       ast_debug(1, "Swapping %u and %u\n", a, b);
 
        towner = p->subs[a].owner;
        p->subs[a].owner = p->subs[b].owner;
@@ -1592,7 +1592,7 @@ void analog_handle_dtmf(struct analog_pvt *p, struct ast_channel *ast, enum anal
 
        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 (analog_check_confirmanswer(p)) {
                if (f->frametype == AST_FRAME_DTMF_END) {
@@ -2685,7 +2685,7 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
 
        res = analog_get_event(p);
 
-       ast_debug(1, "Got event %s(%d) on channel %d (index %d)\n", analog_event2str(res), res, p->channel, idx);
+       ast_debug(1, "Got event %s(%d) on channel %d (index %u)\n", analog_event2str(res), res, p->channel, idx);
 
        if (res & (ANALOG_EVENT_PULSEDIGIT | ANALOG_EVENT_DTMFUP)) {
                analog_set_pulsedial(p, (res & ANALOG_EVENT_PULSEDIGIT) ? 1 : 0);
@@ -2847,7 +2847,7 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
                                        }
 
                                        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 */
@@ -2897,7 +2897,7 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
                                        }
                                }
                        } else {
-                               ast_log(LOG_WARNING, "Got a hangup and my index is %d?\n", idx);
+                               ast_log(LOG_WARNING, "Got a hangup and my index is %u?\n", idx);
                        }
                        /* Fall through */
                default:
@@ -3010,7 +3010,7 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
                                }
                                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 ANALOG_SIG_FXSLS:
@@ -3062,7 +3062,7 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
                                }
                                /* Fall through */
                        default:
-                               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;
                        }
                        break;
@@ -3116,7 +3116,7 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
                case ANALOG_SIG_FXOLS:
                case ANALOG_SIG_FXOGS:
                case ANALOG_SIG_FXOKS:
-                       ast_debug(1, "Winkflash, index: %d, normal: %d, callwait: %d, thirdcall: %d\n",
+                       ast_debug(1, "Winkflash, index: %u, normal: %d, callwait: %d, thirdcall: %d\n",
                                idx, analog_get_sub_fd(p, ANALOG_SUB_REAL), analog_get_sub_fd(p, ANALOG_SUB_CALLWAIT), analog_get_sub_fd(p, ANALOG_SUB_THREEWAY));
 
                        /* Cancel any running CallerID spill */
@@ -3124,7 +3124,7 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
                        p->callwaitcas = 0;
 
                        if (idx != ANALOG_SUB_REAL) {
-                               ast_log(LOG_WARNING, "Got flash hook with index %d on channel %d?!?\n", idx, p->channel);
+                               ast_log(LOG_WARNING, "Got flash hook with index %u on channel %d?!?\n", idx, p->channel);
                                goto winkflashdone;
                        }
 
@@ -3334,7 +3334,7 @@ winkflashdone:
                        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 ANALOG_SIG_FEATDMF_TA:
@@ -3472,7 +3472,7 @@ winkflashdone:
                                case AST_STATE_PRERING:                         /*!< Channel has detected an incoming call and is waiting for ring */
                                default:
                                        if (p->answeronpolarityswitch || p->hanguponpolarityswitch) {
-                                               ast_debug(1, "Ignoring Polarity switch on channel %d, state %d\n", p->channel, ast->_state);
+                                               ast_debug(1, "Ignoring Polarity switch on channel %d, state %u\n", p->channel, ast->_state);
                                        }
                                        break;
                                }
@@ -3483,20 +3483,20 @@ winkflashdone:
                                case AST_STATE_DIALING:         /*!< Digits (or equivalent) have been dialed */
                                case AST_STATE_RINGING:         /*!< Remote end is ringing */
                                        if (p->answeronpolarityswitch) {
-                                               ast_debug(1, "Polarity switch detected but NOT answering (too close to OffHook event) on channel %d, state %d\n", p->channel, ast->_state);
+                                               ast_debug(1, "Polarity switch detected but NOT answering (too close to OffHook event) on channel %d, state %u\n", p->channel, ast->_state);
                                        }
                                        break;
 
                                case AST_STATE_UP:                      /*!< Line is up */
                                case AST_STATE_RING:            /*!< Line is ringing */
                                        if (p->hanguponpolarityswitch) {
-                                               ast_debug(1, "Polarity switch detected but NOT hanging up (too close to Answer event) on channel %d, state %d\n", p->channel, ast->_state);
+                                               ast_debug(1, "Polarity switch detected but NOT hanging up (too close to Answer event) on channel %d, state %u\n", p->channel, ast->_state);
                                        }
                                        break;
 
                                default:
                                        if (p->answeronpolarityswitch || p->hanguponpolarityswitch) {
-                                               ast_debug(1, "Polarity switch detected (too close to previous event) on channel %d, state %d\n", p->channel, ast->_state);
+                                               ast_debug(1, "Polarity switch detected (too close to previous event) on channel %d, state %u\n", p->channel, ast->_state);
                                        }
                                        break;
                                }
@@ -3504,7 +3504,7 @@ winkflashdone:
                }
 
                /* 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);
index 2c4eacf18dc71a3d8eeec9827b7226aa31642ee9..f4cf6fdbb4bc76df796a3eca0ba32d4c57d68528 100644 (file)
@@ -674,15 +674,15 @@ static void sig_pri_set_subaddress(struct ast_party_subaddress *ast_subaddress,
                ptr = cnum;
                len = pri_subaddress->length - 1; /* -1 account for zero based indexing */
                for (x = 0; x < len; ++x) {
-                       ptr += sprintf(ptr, "%02x", pri_subaddress->data[x]);
+                       ptr += sprintf(ptr, "%02x", (unsigned)pri_subaddress->data[x]);
                }
 
                if (pri_subaddress->odd_even_indicator) {
                        /* ODD */
-                       sprintf(ptr, "%01x", (pri_subaddress->data[len]) >> 4);
+                       sprintf(ptr, "%01x", (unsigned)((pri_subaddress->data[len]) >> 4));
                } else {
                        /* EVEN */
-                       sprintf(ptr, "%02x", pri_subaddress->data[len]);
+                       sprintf(ptr, "%02x", (unsigned)pri_subaddress->data[len]);
                }
                ast_subaddress->str = cnum;
        }
@@ -2180,7 +2180,7 @@ static void sig_pri_event_party_id(struct ast_str **msg, const char *prefix, str
 
        /* Party number */
        ast_str_append(msg, 0, "%sNumValid: %d\r\n", prefix,
-               (unsigned) party->number.valid);
+               party->number.valid);
        ast_str_append(msg, 0, "%sNum: %s\r\n", prefix,
                S_COR(party->number.valid, party->number.str, ""));
        ast_str_append(msg, 0, "%ston: %d\r\n", prefix, party->number.plan);
@@ -2193,7 +2193,7 @@ static void sig_pri_event_party_id(struct ast_str **msg, const char *prefix, str
 
        /* Party name */
        ast_str_append(msg, 0, "%sNameValid: %d\r\n", prefix,
-               (unsigned) party->name.valid);
+               party->name.valid);
        ast_str_append(msg, 0, "%sName: %s\r\n", prefix,
                S_COR(party->name.valid, party->name.str, ""));
        if (party->name.valid) {
@@ -6739,7 +6739,7 @@ int sig_pri_call(struct sig_pri_chan *p, struct ast_channel *ast, char *rdest, i
        if (p->pri->facilityenable)
                pri_facility_enable(p->pri->pri);
 
-       ast_verb(3, "Requested transfer capability: 0x%.2x - %s\n", ast->transfercapability, ast_transfercapability2str(ast->transfercapability));
+       ast_verb(3, "Requested transfer capability: 0x%.2x - %s\n", (unsigned)ast->transfercapability, ast_transfercapability2str(ast->transfercapability));
        dp_strip = 0;
        pridialplan = p->pri->dialplan - 1;
        if (pridialplan == -2 || pridialplan == -3) { /* compute dynamically */
@@ -7419,7 +7419,7 @@ int sig_pri_digit_begin(struct sig_pri_chan *pvt, struct ast_channel *ast, char
                }
                if (pvt->call_level < SIG_PRI_CALL_LEVEL_CONNECT) {
                        ast_log(LOG_WARNING,
-                               "Span %d: Digit '%c' may be ignored by peer. (Call level:%d(%s))\n",
+                               "Span %d: Digit '%c' may be ignored by peer. (Call level:%u(%s))\n",
                                pvt->pri->span, digit, pvt->call_level,
                                sig_pri_call_level2str(pvt->call_level));
                }
index cf41587e72f5353ff56f2546dc85c27a292a3c56..46dab688003cfc1450bc02bf6563fa8d046102bc 100644 (file)
@@ -684,7 +684,7 @@ int sip_parse_host(char *line, int lineno, char **hostname, int *portnum, enum s
        }
 
        if (port) {
-               if (!sscanf(port, "%5u", portnum)) {
+               if (!sscanf(port, "%5d", portnum)) {
                        if (lineno) {
                                ast_log(LOG_NOTICE, "'%s' is not a valid port number on line %d of sip.conf. using default.\n", port, lineno);
                        } else {
index 876b58bb079953e30ee7b7a0e8ceb41f255a8b61..6c113e5fe0361e199bb27666252ca32c88b9d470 100644 (file)
@@ -1034,7 +1034,7 @@ struct sip_pvt {
        int jointnoncodeccapability;      /*!< Joint Non codec capability */
        format_t redircodecs;             /*!< Redirect codecs */
        int maxcallbitrate;               /*!< Maximum Call Bitrate for Video Calls */  
-       int t38_maxdatagram;              /*!< T.38 FaxMaxDatagram override */
+       unsigned int t38_maxdatagram;              /*!< T.38 FaxMaxDatagram override */
        int request_queue_sched_id;       /*!< Scheduler ID of any scheduled action to process queued requests */
        int provisional_keepalive_sched_id;   /*!< Scheduler ID for provisional responses that need to be sent out to avoid cancellation */
        const char *last_provisional;         /*!< The last successfully transmitted provisonal response message */
@@ -1237,7 +1237,7 @@ struct sip_peer {
        int inRinging;                  /*!< Number of calls ringing */
        int onHold;                     /*!< Peer has someone on hold */
        int call_limit;                 /*!< Limit of concurrent calls */
-       int t38_maxdatagram;            /*!< T.38 FaxMaxDatagram override */
+       unsigned int t38_maxdatagram;            /*!< T.38 FaxMaxDatagram override */
        int busy_level;                 /*!< Level of active channels where we signal busy */
        int maxforwards;                /*!< SIP Loop prevention */
        enum transfermodes allowtransfer;   /*! SIP Refer restriction scheme */
index 49807f8d1cb4d0af32a5bb3a1266fe394e8497a0..455a880ed787e2b2fc94d95483694c6f198579e0 100644 (file)
@@ -304,24 +304,24 @@ static int check_header(FILE *f)
 /*     data_size = ltohl(header[AU_HDR_DATA_SIZE_OFF]); */
        encoding = ltohl(header[AU_HDR_ENCODING_OFF]);
        if (encoding != AU_ENC_8BIT_ULAW) {
-               ast_log(LOG_WARNING, "Unexpected format: %d. Only 8bit ULAW allowed (%d)\n", encoding, AU_ENC_8BIT_ULAW);
+               ast_log(LOG_WARNING, "Unexpected format: %u. Only 8bit ULAW allowed (%d)\n", encoding, AU_ENC_8BIT_ULAW);
                return -1;
        }
        sample_rate = ltohl(header[AU_HDR_SAMPLE_RATE_OFF]);
        if (sample_rate != DEFAULT_SAMPLE_RATE) {
-               ast_log(LOG_WARNING, "Sample rate can only be 8000 not %d\n", sample_rate);
+               ast_log(LOG_WARNING, "Sample rate can only be 8000 not %u\n", sample_rate);
                return -1;
        }
        channels = ltohl(header[AU_HDR_CHANNELS_OFF]);
        if (channels != 1) {
-               ast_log(LOG_WARNING, "Not in mono: channels=%d\n", channels);
+               ast_log(LOG_WARNING, "Not in mono: channels=%u\n", channels);
                return -1;
        }
        /* Skip to data */
        fseek(f, 0, SEEK_END);
        data_size = ftell(f) - hdr_size;
        if (fseek(f, hdr_size, SEEK_SET) == -1 ) {
-               ast_log(LOG_WARNING, "Failed to skip to data: %d\n", hdr_size);
+               ast_log(LOG_WARNING, "Failed to skip to data: %u\n", hdr_size);
                return -1;
        }
        return data_size;
index cc4d47a789214adb78142f19ea9f6605b9d2cdcd..d2fd6007c9b5d3a061b4b8148cf37d09a70556a1 100644 (file)
@@ -363,7 +363,7 @@ static int enum_result_read(struct ast_channel *chan, const char *cmd, char *dat
        erds = datastore->data;
 
        if (!strcasecmp(args.resultnum, "getnum")) {
-               snprintf(buf, len, "%u", erds->context->naptr_rrs_count);
+               snprintf(buf, len, "%d", erds->context->naptr_rrs_count);
                res = 0;
                goto finish;
        }
index 7fc1823ce9f01f1d5592a65a32920a84ed12167b..a0c8abd6ccaef1ade191d1594f03e4e86bd96572 100644 (file)
@@ -291,7 +291,7 @@ static int stat_read(struct ast_channel *chan, const char *cmd, char *data,
                        strcpy(buf, "1");
                        break;
                case 's':
-                       snprintf(buf, len, "%d", (unsigned int) s.st_size);
+                       snprintf(buf, len, "%u", (unsigned int) s.st_size);
                        break;
                case 'f':
                        snprintf(buf, len, "%d", S_ISREG(s.st_mode) ? 1 : 0);
@@ -309,7 +309,7 @@ static int stat_read(struct ast_channel *chan, const char *cmd, char *data,
                        snprintf(buf, len, "%d", (int) s.st_ctime);
                        break;
                case 'm':
-                       snprintf(buf, len, "%o", (int) s.st_mode);
+                       snprintf(buf, len, "%o", s.st_mode);
                        break;
                }
        }
@@ -700,7 +700,7 @@ static int file_read(struct ast_channel *chan, const char *cmd, char *data, stru
                        if (fread(fbuf, 1, i + sizeof(fbuf) > flength ? flength - i : sizeof(fbuf), ff) < (i + sizeof(fbuf) > flength ? flength - i : sizeof(fbuf))) {
                                ast_log(LOG_ERROR, "Short read?!!\n");
                        }
-                       ast_debug(3, "Appending first %" PRId64" bytes of fbuf=%s\n", i + sizeof(fbuf) > length_offset ? length_offset - i : sizeof(fbuf), fbuf);
+                       ast_debug(3, "Appending first %" PRId64" bytes of fbuf=%s\n", (long)(i + sizeof(fbuf) > length_offset ? length_offset - i : sizeof(fbuf)), fbuf);
                        ast_str_append_substr(buf, len, fbuf, i + sizeof(fbuf) > length_offset ? length_offset - i : sizeof(fbuf));
                }
        } else if (length == 0) {
index 4c4f65f1acb6aa2115c02c3cdec5c11a0d5d06d5..c3d02865cc729729e1b8068180c0310276ca77cd 100644 (file)
@@ -95,7 +95,7 @@ static int iconv_read(struct ast_channel *chan, const char *cmd, char *arguments
        AST_STANDARD_APP_ARGS(args, parse);
 
        if (args.argc < 3) {
-               ast_log(LOG_WARNING, "Syntax: ICONV(<in-charset>,<out-charset>,<text>) %d\n", args.argc);
+               ast_log(LOG_WARNING, "Syntax: ICONV(<in-charset>,<out-charset>,<text>) %u\n", args.argc);
                return -1;
        }
 
index deb94835fa17ebbfb8375dd4dfc2d6e22819cb26..3786a2fa2adc240984cbf543c7420df48847e7d5 100644 (file)
@@ -236,11 +236,11 @@ static int srv_result_read(struct ast_channel *chan, const char *cmd, char *data
        if (!strcasecmp(args.field, "host")) {
                ast_copy_string(buf, host, len);
        } else if (!strcasecmp(args.field, "port")) {
-               snprintf(buf, len, "%u", port);
+               snprintf(buf, len, "%d", port);
        } else if (!strcasecmp(args.field, "priority")) {
-               snprintf(buf, len, "%u", priority);
+               snprintf(buf, len, "%d", priority);
        } else if (!strcasecmp(args.field, "weight")) {
-               snprintf(buf, len, "%u", weight);
+               snprintf(buf, len, "%d", weight);
        } else {
                ast_log(LOG_WARNING, "Unrecognized SRV field '%s'\n", args.field);
                return -1;
index dce392f29fac5350bfd668d263692fac32455ecd..8da94dd334e49180d8d3984474d485abef5923cd 100644 (file)
@@ -115,15 +115,15 @@ static int sysinfo_helper(struct ast_channel *chan, const char *cmd, char *data,
        else if (!strcasecmp("uptime", data)) {             /* in hours */
                snprintf(buf, len, "%ld", sys_info.uptime/3600);
        } else if (!strcasecmp("totalram", data)) {         /* in KiB */
-               snprintf(buf, len, "%ld",(sys_info.totalram * sys_info.mem_unit)/1024);
+               snprintf(buf, len, "%lu",(sys_info.totalram * sys_info.mem_unit)/1024);
        } else if (!strcasecmp("freeram", data)) {          /* in KiB */
-               snprintf(buf, len, "%ld",(sys_info.freeram * sys_info.mem_unit)/1024);
+               snprintf(buf, len, "%lu",(sys_info.freeram * sys_info.mem_unit)/1024);
        } else if (!strcasecmp("bufferram", data)) {        /* in KiB */
-               snprintf(buf, len, "%ld",(sys_info.bufferram * sys_info.mem_unit)/1024);
+               snprintf(buf, len, "%lu",(sys_info.bufferram * sys_info.mem_unit)/1024);
        } else if (!strcasecmp("totalswap", data)) {        /* in KiB */
-               snprintf(buf, len, "%ld",(sys_info.totalswap * sys_info.mem_unit)/1024);
+               snprintf(buf, len, "%lu",(sys_info.totalswap * sys_info.mem_unit)/1024);
        } else if (!strcasecmp("freeswap", data)) {         /* in KiB */
-               snprintf(buf, len, "%ld",(sys_info.freeswap * sys_info.mem_unit)/1024);
+               snprintf(buf, len, "%lu",(sys_info.freeswap * sys_info.mem_unit)/1024);
        } else if (!strcasecmp("numprocs", data)) {
                snprintf(buf, len, "%d", sys_info.procs);
        }
index d32a7d0e14f128935ab0dc7c0d566026a87baa72..a18d70658f9cbe4262f4c7a7c7ae826b9e748883 100644 (file)
@@ -798,7 +798,7 @@ extern "C" {
  * refcount fields of an object to the specfied string buffer.
  */
 #define ASTOBJ_DUMP(s,slen,obj) \
-       snprintf((s),(slen),"name: %s\nobjflags: %d\nrefcount: %d\n\n", (obj)->name, (obj)->objflags, (obj)->refcount);
+       snprintf((s),(slen),"name: %s\nobjflags: %u\nrefcount: %u\n\n", (obj)->name, (obj)->objflags, (obj)->refcount);
 
 /*! \brief Dump information about all the objects in a container to a file descriptor.
  *
index 32bd11aed3bb847de19e20dec26e6c1040a6f5c4..15a821748f4a84f693032a5e238297052806408e 100644 (file)
@@ -326,7 +326,7 @@ int ast_jb_put(struct ast_channel *chan, struct ast_frame *f)
        /* We consider an enabled jitterbuffer should receive frames with valid timing info. */
        if (!ast_test_flag(f, AST_FRFLAG_HAS_TIMING_INFO) || f->len < 2 || f->ts < 0) {
                ast_log(LOG_WARNING, "%s received frame with invalid timing info: "
-                       "has_timing_info=%d, len=%ld, ts=%ld, src=%s\n",
+                       "has_timing_info=%u, len=%ld, ts=%ld, src=%s\n",
                        chan->name, ast_test_flag(f, AST_FRFLAG_HAS_TIMING_INFO), f->len, f->ts, f->src);
                return -1;
        }
index bb8570af39f7e8becd9919cc2782d807c90154e8..fcbbd11c5b4453418cbeaa64b206432591c52b1f 100644 (file)
@@ -341,7 +341,7 @@ void ast_adsi_install_funcs(const struct adsi_funcs *funcs)
 {
        if (funcs && funcs->version < current_adsi_version) {
                ast_log(LOG_WARNING, "Cannot install ADSI function pointers due to version mismatch."
-                               "Ours: %u, Theirs: %u\n", current_adsi_version, funcs->version);
+                               "Ours: %d, Theirs: %u\n", current_adsi_version, funcs->version);
                return;
        }
 
index dcc00725b43cb0ecc69a83e405976afaa10cd551..dcf32bd61786a7931544380ecfb0fb7307d24eeb 100644 (file)
@@ -1431,7 +1431,7 @@ static void aoc_d_event(const struct ast_aoc_decoded *decoded, struct ast_channe
                                        decoded->unit_list[idx].amount);
                        }
                        if (decoded->unit_list[idx].valid_type) {
-                               ast_str_append(msg, 0, "%s/TypeOf: %d\r\n", prefix,
+                               ast_str_append(msg, 0, "%s/TypeOf: %u\r\n", prefix,
                                        decoded->unit_list[idx].type);
                        }
                }
@@ -1499,7 +1499,7 @@ static void aoc_e_event(const struct ast_aoc_decoded *decoded, struct ast_channe
                                        decoded->unit_list[idx].amount);
                        }
                        if (decoded->unit_list[idx].valid_type) {
-                               ast_str_append(msg, 0, "%s/TypeOf: %d\r\n", prefix,
+                               ast_str_append(msg, 0, "%s/TypeOf: %u\r\n", prefix,
                                        decoded->unit_list[idx].type);
                        }
                }
index 8bb03f0cb11a8a34c2b71aaaf33db63a143109dd..3ed7de34921c368c7a1f9fd276199aae17ff966b 100644 (file)
@@ -1340,7 +1340,7 @@ static enum AST_LOCK_RESULT ast_lock_path_lockfile(const char *path)
        s = ast_alloca(lp + 10);
        fs = ast_alloca(lp + 20);
 
-       snprintf(fs, strlen(path) + 19, "%s/.lock-%08lx", path, ast_random());
+       snprintf(fs, strlen(path) + 19, "%s/.lock-%08lx", path, (unsigned long)ast_random());
        fd = open(fs, O_WRONLY | O_CREAT | O_EXCL, AST_FILE_MODE);
        if (fd < 0) {
                ast_log(LOG_ERROR, "Unable to create lock file '%s': %s\n", path, strerror(errno));
@@ -1718,7 +1718,7 @@ static int ivr_dispatch(struct ast_channel *chan, struct ast_ivr_option *option,
                ast_stopstream(chan);
                return res;
        default:
-               ast_log(LOG_NOTICE, "Unknown dispatch function %d, ignoring!\n", option->action);
+               ast_log(LOG_NOTICE, "Unknown dispatch function %u, ignoring!\n", option->action);
                return 0;
        }
        return -1;
index dc1c0aea01caa04281c9e8f6a7d05ad55e394620..eab4f625791be1c998a75912678b58ccc412e412 100644 (file)
@@ -669,14 +669,14 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl
 
        ast_cli(a->fd, "\nSystem Statistics\n");
        ast_cli(a->fd, "-----------------\n");
-       ast_cli(a->fd, "  System Uptime:             %lu hours\n", uptime);
+       ast_cli(a->fd, "  System Uptime:             %ld hours\n", uptime);
        ast_cli(a->fd, "  Total RAM:                 %" PRIu64 " KiB\n", physmem / 1024);
        ast_cli(a->fd, "  Free RAM:                  %" PRIu64 " KiB\n", freeram);
 #if defined(HAVE_SYSINFO)
        ast_cli(a->fd, "  Buffer RAM:                %" PRIu64 " KiB\n", ((uint64_t) sys_info.bufferram * sys_info.mem_unit) / 1024);
 #endif
 #if defined (HAVE_SYSCTL) || defined(HAVE_SWAPCTL)
-       ast_cli(a->fd, "  Total Swap Space:          %u KiB\n", totalswap);
+       ast_cli(a->fd, "  Total Swap Space:          %d KiB\n", totalswap);
        ast_cli(a->fd, "  Free Swap Space:           %" PRIu64 " KiB\n\n", freeswap);
 #endif
        ast_cli(a->fd, "  Number of Processes:       %d \n\n", nprocs);
@@ -1505,7 +1505,7 @@ static int ast_makesocket(void)
                ast_log(LOG_WARNING, "Unable to change ownership of %s: %s\n", ast_config_AST_SOCKET, strerror(errno));
 
        if (!ast_strlen_zero(ast_config_AST_CTL_PERMISSIONS)) {
-               int p1;
+               unsigned int p1;
                mode_t p;
                sscanf(ast_config_AST_CTL_PERMISSIONS, "%30o", &p1);
                p = p1;
index ab6ce73740726794aa141b1c9bfa4b897d556242..1a8276156d92f153d6633c31d90ab47078259f9d 100644 (file)
@@ -230,7 +230,7 @@ static struct ast_frame *audiohook_read_frame_both(struct ast_audiohook *audioho
 
        if (!usable_read && !usable_write) {
                /* If both factories are unusable bail out */
-               ast_debug(1, "Read factory %p and write factory %p both fail to provide %zd samples\n", &audiohook->read_factory, &audiohook->write_factory, samples);
+               ast_debug(1, "Read factory %p and write factory %p both fail to provide %zu samples\n", &audiohook->read_factory, &audiohook->write_factory, samples);
                return NULL;
        }
 
@@ -819,7 +819,7 @@ int ast_channel_audiohook_count_by_source(struct ast_channel *chan, const char *
                        }
                        break;
                default:
-                       ast_log(LOG_DEBUG, "Invalid audiohook type supplied, (%d)\n", type);
+                       ast_log(LOG_DEBUG, "Invalid audiohook type supplied, (%u)\n", type);
                        return -1;
        }
 
@@ -854,7 +854,7 @@ int ast_channel_audiohook_count_by_source_running(struct ast_channel *chan, cons
                        }
                        break;
                default:
-                       ast_log(LOG_DEBUG, "Invalid audiohook type supplied, (%d)\n", type);
+                       ast_log(LOG_DEBUG, "Invalid audiohook type supplied, (%u)\n", type);
                        return -1;
        }
        return count;
index e849a98c71d80d5aef4d48d7374aa6ced87f7047..765523125433b32f6b4d61698f830b7c2fea676e 100644 (file)
@@ -389,7 +389,7 @@ static struct ast_bridge_technology *find_best_technology(enum ast_bridge_capabi
 
        AST_RWLIST_RDLOCK(&bridge_technologies);
        AST_RWLIST_TRAVERSE(&bridge_technologies, current, entry) {
-               ast_debug(1, "Bridge technology %s has capabilities %d and we want %d\n", current->name, current->capabilities, capabilities);
+               ast_debug(1, "Bridge technology %s has capabilities %d and we want %u\n", current->name, current->capabilities, capabilities);
                if (current->suspended) {
                        ast_debug(1, "Bridge technology %s is suspended. Skipping.\n", current->name);
                        continue;
@@ -399,7 +399,7 @@ static struct ast_bridge_technology *find_best_technology(enum ast_bridge_capabi
                        continue;
                }
                if (best && best->preference < current->preference) {
-                       ast_debug(1, "Bridge technology %s has preference %d while %s has preference %d. Skipping.\n", current->name, current->preference, best->name, best->preference);
+                       ast_debug(1, "Bridge technology %s has preference %u while %s has preference %u. Skipping.\n", current->name, current->preference, best->name, best->preference);
                        continue;
                }
                best = current;
@@ -468,7 +468,7 @@ struct ast_bridge *ast_bridge_new(enum ast_bridge_capability capabilities, int f
 
        /* If no bridge technology was found we can't possibly do bridging so fail creation of the bridge */
        if (!bridge_technology) {
-               ast_debug(1, "Failed to find a bridge technology to satisfy capabilities %d\n", capabilities);
+               ast_debug(1, "Failed to find a bridge technology to satisfy capabilities %u\n", capabilities);
                return NULL;
        }
 
@@ -622,7 +622,7 @@ static int smart_bridge_operation(struct ast_bridge *bridge, struct ast_bridge_c
 
        /* Attempt to find a new bridge technology to satisfy the capabilities */
        if (!(new_technology = find_best_technology(new_capabilities))) {
-               ast_debug(1, "Smart bridge operation was unable to find new bridge technology with capabilities %d to satisfy bridge %p\n", new_capabilities, bridge);
+               ast_debug(1, "Smart bridge operation was unable to find new bridge technology with capabilities %u to satisfy bridge %p\n", new_capabilities, bridge);
                return -1;
        }
 
@@ -1299,7 +1299,7 @@ int ast_bridge_features_enable(struct ast_bridge_features *features, enum ast_br
                dtmf = builtin_features_dtmf[feature];
                /* If no DTMF is still available (ie: it has been disabled) then error out now */
                if (ast_strlen_zero(dtmf)) {
-                       ast_debug(1, "Failed to enable built in feature %d on %p, no DTMF string is available for it.\n", feature, features);
+                       ast_debug(1, "Failed to enable built in feature %u on %p, no DTMF string is available for it.\n", feature, features);
                        return -1;
                }
        }
index 4fab07d2cb7729e1b7ed217eb592fb029295b602..cb6e58857369d80a62080328d49afe5610948508 100644 (file)
@@ -447,7 +447,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, f
                                                case 0x06: /* short dial number */
                                                case 0x07: /* reserved */
                                                default:   /* reserved */
-                                                       ast_debug(2, "cid info:#1=%X\n", cid->rawdata[x]);
+                                                       ast_debug(2, "cid info:#1=%X\n", (unsigned)cid->rawdata[x]);
                                                        break ;
                                                }
                                                x++; 
@@ -463,7 +463,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, f
                                                case 0x09: /* private dial plan */
                                                case 0x05: /* reserved */
                                                default:   /* reserved */
-                                                       ast_debug(2, "cid info:#2=%X\n", cid->rawdata[x]);
+                                                       ast_debug(2, "cid info:#2=%X\n", (unsigned)cid->rawdata[x]);
                                                        break ;
                                                }
                                                x++; 
@@ -503,7 +503,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, f
                                                case 0x07: /* reserved */
                                                default:   /* reserved */
                                                        if (option_debug > 1)
-                                                               ast_log(LOG_NOTICE, "did info:#1=%X\n", cid->rawdata[x]);
+                                                               ast_log(LOG_NOTICE, "did info:#1=%X\n", (unsigned)cid->rawdata[x]);
                                                        break ;
                                                }
                                                x++;
@@ -519,7 +519,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, f
                                                case 0x09: /* private dial plan */
                                                case 0x05: /* reserved */
                                                default:   /* reserved */
-                                                       ast_debug(2, "did info:#2=%X\n", cid->rawdata[x]);
+                                                       ast_debug(2, "did info:#2=%X\n", (unsigned)cid->rawdata[x]);
                                                        break ;
                                                }
                                                x++;
index 436d3d2921f4d8e3e5e92d5d99aec412295142bd..19b9c19ef399537c0d05e078b029501a7b727a01 100644 (file)
@@ -1845,7 +1845,7 @@ static struct ast_cc_monitor *cc_extension_monitor_init(const char * const exten
        cc_interface->monitor_class = AST_CC_EXTENSION_MONITOR;
        strcpy(cc_interface->device_name, ast_str_buffer(str));
        monitor->interface = cc_interface;
-       ast_log_dynamic_level(cc_logger_level, "Created an extension cc interface for '%s' with id %d and parent %d\n", cc_interface->device_name, monitor->id, monitor->parent_id);
+       ast_log_dynamic_level(cc_logger_level, "Created an extension cc interface for '%s' with id %u and parent %u\n", cc_interface->device_name, monitor->id, monitor->parent_id);
        return monitor;
 }
 
@@ -2024,7 +2024,7 @@ static struct ast_cc_monitor *cc_device_monitor_init(const char * const device_n
        monitor->interface = cc_interface;
        monitor->available_timer_id = -1;
        ast_cc_copy_config_params(cc_interface->config_params, &cc_data->config_params);
-       ast_log_dynamic_level(cc_logger_level, "Core %d: Created a device cc interface for '%s' with id %d and parent %d\n",
+       ast_log_dynamic_level(cc_logger_level, "Core %d: Created a device cc interface for '%s' with id %u and parent %u\n",
                        monitor->core_id, cc_interface->device_name, monitor->id, monitor->parent_id);
        return monitor;
 }
@@ -2324,7 +2324,7 @@ static struct ast_cc_agent *cc_agent_init(struct ast_channel *caller_chan,
                cc_unref(agent, "Agent init callback failed.");
                return NULL;
        }
-       ast_log_dynamic_level(cc_logger_level, "Core %d: Created an agent for caller %s\n",
+       ast_log_dynamic_level(cc_logger_level, "Core %u: Created an agent for caller %s\n",
                        agent->core_id, agent->device_name);
        return agent;
 }
@@ -2429,7 +2429,7 @@ static int offer_timer_expire(const void *data)
 {
        struct ast_cc_agent *agent = (struct ast_cc_agent *) data;
        struct cc_generic_agent_pvt *agent_pvt = agent->private_data;
-       ast_log_dynamic_level(cc_logger_level, "Core %d: Queuing change request because offer timer has expired.\n",
+       ast_log_dynamic_level(cc_logger_level, "Core %u: Queuing change request because offer timer has expired.\n",
                        agent->core_id);
        agent_pvt->offer_timer_id = -1;
        ast_cc_failed(agent->core_id, "Generic agent %s offer timer expired", agent->device_name);
@@ -2447,7 +2447,7 @@ static int cc_generic_agent_start_offer_timer(struct ast_cc_agent *agent)
        ast_assert(agent->cc_params != NULL);
 
        when = ast_get_cc_offer_timer(agent->cc_params) * 1000;
-       ast_log_dynamic_level(cc_logger_level, "Core %d: About to schedule offer timer expiration for %d ms\n",
+       ast_log_dynamic_level(cc_logger_level, "Core %u: About to schedule offer timer expiration for %d ms\n",
                        agent->core_id, when);
        if ((sched_id = ast_sched_thread_add(cc_sched_thread, when, offer_timer_expire, cc_ref(agent, "Give scheduler an agent ref"))) == -1) {
                return -1;
@@ -2564,7 +2564,7 @@ static void *generic_recall(void *data)
        if (!(chan = ast_request_and_dial(tech, AST_FORMAT_SLINEAR, NULL, target, recall_timer, &reason, generic_pvt->cid_num, generic_pvt->cid_name))) {
                /* Hmm, no channel. Sucks for you, bud.
                 */
-               ast_log_dynamic_level(cc_logger_level, "Core %d: Failed to call back %s for reason %d\n",
+               ast_log_dynamic_level(cc_logger_level, "Core %u: Failed to call back %s for reason %d\n",
                                agent->core_id, agent->device_name, reason);
                ast_cc_failed(agent->core_id, "Failed to call back device %s/%s", tech, target);
                return NULL;
@@ -2586,7 +2586,7 @@ static void *generic_recall(void *data)
        pbx_builtin_setvar_helper(chan, "CC_CONTEXT", generic_pvt->context);
 
        if (!ast_strlen_zero(callback_macro)) {
-               ast_log_dynamic_level(cc_logger_level, "Core %d: There's a callback macro configured for agent %s\n",
+               ast_log_dynamic_level(cc_logger_level, "Core %u: There's a callback macro configured for agent %s\n",
                                agent->core_id, agent->device_name);
                if (ast_app_run_macro(NULL, chan, callback_macro, NULL)) {
                        ast_cc_failed(agent->core_id, "Callback macro to %s failed. Maybe a hangup?", agent->device_name);
@@ -2715,7 +2715,7 @@ static int is_state_change_valid(enum cc_state current_state, const enum cc_stat
        int is_valid = 0;
        switch (new_state) {
        case CC_AVAILABLE:
-               ast_log_dynamic_level(cc_logger_level, "Core %d: Asked to change to state %d? That should never happen.\n",
+               ast_log_dynamic_level(cc_logger_level, "Core %u: Asked to change to state %u? That should never happen.\n",
                                agent->core_id, new_state);
                break;
        case CC_CALLER_OFFERED:
@@ -2758,7 +2758,7 @@ static int is_state_change_valid(enum cc_state current_state, const enum cc_stat
                is_valid = 1;
                break;
        default:
-               ast_log_dynamic_level(cc_logger_level, "Core %d: Asked to change to unknown state %d\n",
+               ast_log_dynamic_level(cc_logger_level, "Core %u: Asked to change to unknown state %u\n",
                                agent->core_id, new_state);
                break;
        }
@@ -3028,7 +3028,7 @@ static int cc_do_state_change(void *datap)
        enum cc_state previous_state;
        int res;
 
-       ast_log_dynamic_level(cc_logger_level, "Core %d: State change to %d requested. Reason: %s\n",
+       ast_log_dynamic_level(cc_logger_level, "Core %d: State change to %u requested. Reason: %s\n",
                        args->core_id, args->state, args->debug);
 
        core_instance = args->core_instance;
index 8600b5f0b13d0e21e55cd756b2adda68bf51d741..4daf04243c0a6cee4ec7f2aa5452b3e336602850 100644 (file)
@@ -417,7 +417,7 @@ const char *ast_cel_get_type_name(enum ast_cel_event_type type)
 const char *ast_cel_get_ama_flag_name(enum ast_cel_ama_flag flag)
 {
        if (flag < 0 || flag >= ARRAY_LEN(cel_ama_flags)) {
-               ast_log(LOG_WARNING, "Invalid AMA flag: %d\n", flag);
+               ast_log(LOG_WARNING, "Invalid AMA flag: %u\n", flag);
                return "Unknown";
        }
 
index eb2389e5d84acdb33461ee47f59d51ff6b72ac1f..91097451d1b8addbe58c8eef310215af124c61a8 100644 (file)
@@ -1032,7 +1032,7 @@ const char *ast_state2str(enum ast_channel_state state)
        default:
                if (!(buf = ast_threadstorage_get(&state2str_threadbuf, STATE2STR_BUFSIZE)))
                        return "Unknown";
-               snprintf(buf, STATE2STR_BUFSIZE, "Unknown (%d)", state);
+               snprintf(buf, STATE2STR_BUFSIZE, "Unknown (%u)", state);
                return buf;
        }
 }
@@ -1541,7 +1541,7 @@ static int __ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, in
 
                memset(blah, 1, sizeof(blah));
                if (write(chan->alertpipe[1], &blah, sizeof(blah)) != (sizeof(blah))) {
-                       ast_log(LOG_WARNING, "Unable to write to alert pipe on %s (qlen = %d): %s!\n",
+                       ast_log(LOG_WARNING, "Unable to write to alert pipe on %s (qlen = %u): %s!\n",
                                chan->name, queued_frames, strerror(errno));
                }
        } else if (chan->timingfd > -1) {
@@ -3014,7 +3014,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer)
                                        break;
                                }
                                if (ms == 0) {
-                                       ast_debug(2, "Didn't receive a media frame from %s within %d ms of answering. Continuing anyway\n", chan->name, MAX(delay, 500));
+                                       ast_debug(2, "Didn't receive a media frame from %s within %u ms of answering. Continuing anyway\n", chan->name, MAX(delay, 500));
                                        break;
                                }
                                cur = ast_read(chan);
@@ -4620,14 +4620,14 @@ int ast_indicate_data(struct ast_channel *chan, int _condition,
 
        if (ts) {
                /* We have a tone to play, yay. */
-               ast_debug(1, "Driver for channel '%s' does not support indication %d, emulating it\n", chan->name, condition);
+               ast_debug(1, "Driver for channel '%s' does not support indication %u, emulating it\n", chan->name, condition);
                res = ast_playtones_start(chan, 0, ts->data, 1);
                ts = ast_tone_zone_sound_unref(ts);
        }
 
        if (res) {
                /* not handled */
-               ast_log(LOG_WARNING, "Unable to handle indication %d for '%s'\n", condition, chan->name);
+               ast_log(LOG_WARNING, "Unable to handle indication %u for '%s'\n", condition, chan->name);
        }
 
 indicate_cleanup:
@@ -6666,7 +6666,7 @@ int ast_do_masquerade(struct ast_channel *original)
        /* Start the masquerade channel contents rearangement. */
        ast_channel_lock_both(original, clonechan);
 
-       ast_debug(4, "Actually Masquerading %s(%d) into the structure of %s(%d)\n",
+       ast_debug(4, "Actually Masquerading %s(%u) into the structure of %s(%u)\n",
                clonechan->name, clonechan->_state, original->name, original->_state);
 
        chans[0] = clonechan;
@@ -6984,7 +6984,7 @@ int ast_do_masquerade(struct ast_channel *original)
                pthread_kill(original->blocker, SIGURG);
        }
 
-       ast_debug(1, "Done Masquerading %s (%d)\n", original->name, original->_state);
+       ast_debug(1, "Done Masquerading %s (%u)\n", original->name, original->_state);
 
        if ((bridged = ast_bridged_channel(original))) {
                ast_channel_ref(bridged);
@@ -7134,7 +7134,7 @@ int ast_setstate(struct ast_channel *chan, enum ast_channel_state state)
        /* setstate used to conditionally report Newchannel; this is no more */
        ast_manager_event(chan, EVENT_FLAG_CALL, "Newstate",
                "Channel: %s\r\n"
-               "ChannelState: %d\r\n"
+               "ChannelState: %u\r\n"
                "ChannelStateDesc: %s\r\n"
                "CallerIDNum: %s\r\n"
                "CallerIDName: %s\r\n"
index 17f21c915a493f67badfd1850aecdd0a0c357eb6..02803b90882acdca78aacbc986d0f7b78a11af37 100644 (file)
@@ -509,14 +509,14 @@ static char *handle_verbose(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
                        if (AST_RWLIST_EMPTY(mll))
                                ast_clear_flag(&ast_options, is_debug ? AST_OPT_FLAG_DEBUG_MODULE : AST_OPT_FLAG_VERBOSE_MODULE);
                        AST_RWLIST_UNLOCK(mll);
-                       ast_cli(fd, "%s was %d and has been set to 0 for '%s'\n", what, ml->level, mod);
+                       ast_cli(fd, "%s was %u and has been set to 0 for '%s'\n", what, ml->level, mod);
                        ast_free(ml);
                        return CLI_SUCCESS;
                }
 
                if (ml) {
                        if ((atleast && newlevel < ml->level) || ml->level == newlevel) {
-                               ast_cli(fd, "%s is %d for '%s'\n", what, ml->level, mod);
+                               ast_cli(fd, "%s is %u for '%s'\n", what, ml->level, mod);
                                AST_RWLIST_UNLOCK(mll);
                                return CLI_SUCCESS;
                        }
@@ -538,7 +538,7 @@ static char *handle_verbose(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
 
                AST_RWLIST_UNLOCK(mll);
 
-               ast_cli(fd, "%s was %d and has been set to %d for '%s'\n", what, oldval, ml->level, ml->module);
+               ast_cli(fd, "%s was %d and has been set to %u for '%s'\n", what, oldval, ml->level, ml->module);
 
                return CLI_SUCCESS;
        } else if (!newlevel) {
@@ -1456,7 +1456,7 @@ static char *handle_showchan(struct ast_cli_entry *e, int cmd, struct ast_cli_ar
                "Connected Line ID Name: %s\n"
                "    DNID Digits: %s\n"
                "       Language: %s\n"
-               "          State: %s (%d)\n"
+               "          State: %s (%u)\n"
                "          Rings: %d\n"
                "  NativeFormats: %s\n"
                "    WriteFormat: %s\n"
@@ -1464,8 +1464,8 @@ static char *handle_showchan(struct ast_cli_entry *e, int cmd, struct ast_cli_ar
                " WriteTranscode: %s %s\n"
                "  ReadTranscode: %s %s\n"
                "1st File Descriptor: %d\n"
-               "      Frames in: %d%s\n"
-               "     Frames out: %d%s\n"
+               "      Frames in: %u%s\n"
+               "     Frames out: %u%s\n"
                " Time to Hangup: %ld\n"
                "   Elapsed Time: %s\n"
                "  Direct Bridge: %s\n"
index 4a88ef3871d9cab81a96330eb94f3fd79cd3de4a..e8c5cf7d7a0d60086af0db4e3b45837c989fa487 100644 (file)
@@ -2687,7 +2687,7 @@ char *ast_realtime_decode_chunk(char *chunk)
        char *orig = chunk;
        for (; *chunk; chunk++) {
                if (*chunk == '^' && strchr("0123456789ABCDEFabcdef", chunk[1]) && strchr("0123456789ABCDEFabcdef", chunk[2])) {
-                       sscanf(chunk + 1, "%02hhX", chunk);
+                       sscanf(chunk + 1, "%02hhX", (unsigned char *)chunk);
                        memmove(chunk + 1, chunk + 3, strlen(chunk + 3) + 1);
                }
        }
index 020e2ca66ccb887152fd678dd6c4afa414a96391..eed6b1944c38cba7702f3dc75851075bd314085c 100644 (file)
@@ -2115,17 +2115,17 @@ static void data_get_xml_add_child(struct ast_data *parent_data,
                        ast_xml_set_text(child_xml, node->payload.str);
                        break;
                case AST_DATA_TIMESTAMP:
-                       snprintf(node_content, sizeof(node_content), "%d",
+                       snprintf(node_content, sizeof(node_content), "%u",
                                node->payload.uint);
                        ast_xml_set_text(child_xml, node_content);
                        break;
                case AST_DATA_SECONDS:
-                       snprintf(node_content, sizeof(node_content), "%d",
+                       snprintf(node_content, sizeof(node_content), "%u",
                                node->payload.uint);
                        ast_xml_set_text(child_xml, node_content);
                        break;
                case AST_DATA_MILLISECONDS:
-                       snprintf(node_content, sizeof(node_content), "%d",
+                       snprintf(node_content, sizeof(node_content), "%u",
                                node->payload.uint);
                        ast_xml_set_text(child_xml, node_content);
                        break;
@@ -2754,17 +2754,17 @@ static void data_result_print_cli_node(int fd, const struct ast_data *node, uint
                                node->name);
                break;
        case AST_DATA_TIMESTAMP:
-               ast_str_append(&output, 0, "%s%s: %d\n", ast_str_buffer(tabs),
+               ast_str_append(&output, 0, "%s%s: %u\n", ast_str_buffer(tabs),
                                node->name,
                                node->payload.uint);
                break;
        case AST_DATA_SECONDS:
-               ast_str_append(&output, 0, "%s%s: %d\n", ast_str_buffer(tabs),
+               ast_str_append(&output, 0, "%s%s: %u\n", ast_str_buffer(tabs),
                                node->name,
                                node->payload.uint);
                break;
        case AST_DATA_MILLISECONDS:
-               ast_str_append(&output, 0, "%s%s: %d\n", ast_str_buffer(tabs),
+               ast_str_append(&output, 0, "%s%s: %u\n", ast_str_buffer(tabs),
                                node->name,
                                node->payload.uint);
                break;
@@ -2815,6 +2815,7 @@ static void data_result_print_cli_node(int fd, const struct ast_data *node, uint
  * \param[in] root The root node of the tree.
  * \param[in] depth Actual depth.
  */
+
 static void __data_result_print_cli(int fd, const struct ast_data *root, uint32_t depth)
 {
        struct ao2_iterator iter;
index 56465402edd59573d477eb3f1b82a9126ed51cbf..28f494ff6edffb8113c9a1852c3cfce625b1a23e 100644 (file)
@@ -439,7 +439,7 @@ static void devstate_event(const char *device, enum ast_device_state state, int
                event_type = AST_EVENT_DEVICE_STATE;
        }
 
-       ast_debug(3, "device '%s' state '%d'\n", device, state);
+       ast_debug(3, "device '%s' state '%u'\n", device, state);
 
        if (!(event = ast_event_new(event_type,
                                    AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, device,
@@ -464,7 +464,7 @@ static void do_state_change(const char *device, int cachable)
 
        state = _ast_device_state(device, 0);
 
-       ast_debug(3, "Changing state for %s - state %d (%s)\n", device, state, ast_devstate2str(state));
+       ast_debug(3, "Changing state for %s - state %u (%s)\n", device, state, ast_devstate2str(state));
 
        devstate_event(device, state, cachable);
 }
index 20a6116d3b1362bccf25ab92ae745915aedbd3ea..247f07b4a15847772cd64aff6563b866deee1fc2 100644 (file)
@@ -1100,7 +1100,7 @@ static int __ast_dsp_call_progress(struct ast_dsp *dsp, short *s, int len)
                                }
                                break;
                        default:
-                               ast_log(LOG_WARNING, "Can't process in unknown prog mode '%d'\n", dsp->progmode);
+                               ast_log(LOG_WARNING, "Can't process in unknown prog mode '%u'\n", dsp->progmode);
                        }
                        if (newstate == dsp->tstate) {
                                dsp->tcount++;
index 065f4b947c347d80af58e92106cac5b29021df69..876be8b795cfc97b40c6e1261d74eea36347e522 100644 (file)
@@ -376,7 +376,7 @@ static unsigned int parse_ie(char *data, unsigned int maxdatalen, unsigned char
        srclen--;
 
        if (len > srclen) {
-               ast_log(LOG_WARNING, "ENUM parsing failed: Wanted %d characters, got %d\n", len, srclen);
+               ast_log(LOG_WARNING, "ENUM parsing failed: Wanted %u characters, got %u\n", len, srclen);
                return -1;
        }
 
@@ -654,7 +654,7 @@ int ast_get_enum(struct ast_channel *chan, const char *number, char *dst, int ds
                return -1;
        }
 
-       ast_debug(2, "num='%s', tech='%s', suffix='%s', options='%s', record=%d\n", number, tech, suffix, options, record);
+       ast_debug(2, "num='%s', tech='%s', suffix='%s', options='%s', record=%u\n", number, tech, suffix, options, record);
 
 /*
   We don't need that any more, that "n" preceding the number has been replaced by a flag
index bbf7707a3d0dcf937253a42fa50601c795643d07..340eb6627dc975c9f86aab325f7439d7f1efc59e 100644 (file)
@@ -278,7 +278,7 @@ const char *ast_event_get_type_name(const struct ast_event *event)
        type = ast_event_get_type(event);
 
        if (type < 0 || type >= ARRAY_LEN(event_names)) {
-               ast_log(LOG_ERROR, "Invalid event type - '%d'\n", type);
+               ast_log(LOG_ERROR, "Invalid event type - '%u'\n", type);
                return "";
        }
 
@@ -1211,7 +1211,7 @@ struct ast_event *ast_event_new(enum ast_event_type type, ...)
        /* Invalid type */
        if (type >= AST_EVENT_TOTAL) {
                ast_log(LOG_WARNING, "Someone tried to create an event of invalid "
-                       "type '%d'!\n", type);
+                       "type '%u'!\n", type);
                return NULL;
        }
 
index 262ba72ad85f2ea4eb58e8fc043a0f28ee6e2cfa..2d1394fd45f5d2e1d1fefb8af82bddaa18ebd555 100644 (file)
@@ -2776,7 +2776,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
 
                                if (atxferloopdelay) {
                                        /* Transfer failed, sleeping */
-                                       ast_debug(1, "Sleeping for %d ms before retrying atxfer.\n",
+                                       ast_debug(1, "Sleeping for %u ms before retrying atxfer.\n",
                                                atxferloopdelay);
                                        ast_safe_sleep(transferee, atxferloopdelay);
                                        if (ast_check_hangup(transferee)) {
@@ -3403,7 +3403,7 @@ static int feature_interpret(struct ast_channel *chan, struct ast_channel *peer,
 
        snprintf(dynamic_features_buf, sizeof(dynamic_features_buf), "%s%s%s", S_OR(chan_dynamic_features, ""), chan_dynamic_features && peer_dynamic_features ? "#" : "", S_OR(peer_dynamic_features,""));
 
-       ast_debug(3, "Feature interpret: chan=%s, peer=%s, code=%s, sense=%d, features=%d, dynamic=%s\n", chan->name, peer->name, code, sense, features.flags, dynamic_features_buf);
+       ast_debug(3, "Feature interpret: chan=%s, peer=%s, code=%s, sense=%d, features=%u, dynamic=%s\n", chan->name, peer->name, code, sense, features.flags, dynamic_features_buf);
 
        return feature_interpret_helper(chan, peer, config, code, sense, dynamic_features_buf, &features, FEATURE_INTERPRET_DO, &feature);
 }
@@ -3813,7 +3813,7 @@ void ast_channel_log(char *title, struct ast_channel *chan) /* for debug, this i
        ast_log(LOG_NOTICE, "CHAN: name: %s;  appl: %s; data: %s; contxt: %s;  exten: %s; pri: %d;\n",
                        chan->name, chan->appl, chan->data, chan->context, chan->exten, chan->priority);
        ast_log(LOG_NOTICE, "CHAN: acctcode: %s;  dialcontext: %s; amaflags: %x; maccontxt: %s;  macexten: %s; macpri: %d;\n",
-                       chan->accountcode, chan->dialcontext, chan->amaflags, chan->macrocontext, chan->macroexten, chan->macropriority);
+                       chan->accountcode, chan->dialcontext, (unsigned)chan->amaflags, chan->macrocontext, chan->macroexten, chan->macropriority);
        ast_log(LOG_NOTICE, "CHAN: masq: %p;  masqr: %p; _bridge: %p; uniqueID: %s; linkedID:%s\n",
                        chan->masq, chan->masqr,
                        chan->_bridge, chan->uniqueid, chan->linkedid);
@@ -5138,7 +5138,7 @@ static int parked_call_exec(struct ast_channel *chan, const char *data)
        struct ast_context *con;
        char *parse;
        const char *pl_name;
-       int park = 0;
+       unsigned int park = 0;
        struct ast_bridge_config config;
        struct ast_parkinglot *parkinglot;
        AST_DECLARE_APP_ARGS(app_args,
@@ -5321,7 +5321,7 @@ static int parked_call_exec(struct ast_channel *chan, const char *data)
                }
                /* This runs sorta backwards, since we give the incoming channel control, as if it
                   were the person called. */
-               ast_verb(3, "Channel %s connected to parked call %d\n", chan->name, park);
+               ast_verb(3, "Channel %s connected to parked call %u\n", chan->name, park);
 
                pbx_builtin_setvar_helper(chan, "PARKEDCHANNEL", peer->name);
                ast_cdr_setdestchan(chan->cdr, peer->name);
@@ -5373,7 +5373,7 @@ static int parked_call_exec(struct ast_channel *chan, const char *data)
                        ast_log(LOG_WARNING, "ast_streamfile of %s failed on %s\n", "pbx-invalidpark",
                                chan->name);
                }
-               ast_verb(3, "Channel %s tried to retrieve nonexistent parked call %d\n",
+               ast_verb(3, "Channel %s tried to retrieve nonexistent parked call %u\n",
                        chan->name, park);
                res = -1;
        }
index b19382e579172a336dc5e789c71fd6b8a3519a3f..715203d0eaa410233018ac98f067bb643e2d26af 100644 (file)
@@ -535,7 +535,7 @@ static format_t ast_filehelper(const char *filename, const void *arg2, const cha
                                break;
 
                        default:
-                               ast_log(LOG_WARNING, "Unknown helper %d\n", action);
+                               ast_log(LOG_WARNING, "Unknown helper %u\n", action);
                        }
                        ast_free(fn);
                }
index eff553dd66773648817ad37b90d670e2a5742ee2..26f33084f8f180c1d1482c45cb69dbf97700364c 100644 (file)
@@ -719,8 +719,8 @@ static char *show_codecs(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
                        }
                }
 
-               snprintf(hex, sizeof(hex), "(0x%llx)", 1LL << i);
-               ast_cli(a->fd, "%19llu (1 << %2d) %20s  %5s   %8s   (%s)\n", 1LL << i, i, hex,
+               snprintf(hex, sizeof(hex), "(0x%llx)", 1ULL << i);
+               ast_cli(a->fd, "%19llu (1 << %2d) %20s  %5s   %8s   (%s)\n", 1ULL << i, i, hex,
                        ((1LL << i) & AST_FORMAT_AUDIO_MASK) ? "audio" :
                        i == 16 || i == 17 ? "image" :
                        ((1LL << i) & AST_FORMAT_VIDEO_MASK) ? "video" :
@@ -765,7 +765,7 @@ static char *show_codec_n(struct ast_cli_entry *e, int cmd, struct ast_cli_args
        for (i = 0; i < 63; i++)
                if (codec & (1LL << i)) {
                        found = 1;
-                       ast_cli(a->fd, "%11llu (1 << %2d)  %s\n", 1LL << i, i, ast_codec2str(1LL << i));
+                       ast_cli(a->fd, "%11llu (1 << %2d)  %s\n", 1ULL << i, i, ast_codec2str(1LL << i));
                }
 
        if (!found)
@@ -959,10 +959,10 @@ void ast_frame_dump(const char *name, struct ast_frame *f, char *prefix)
                }
                break;
        default:
-               snprintf(ftype, sizeof(ftype), "Unknown Frametype '%d'", f->frametype);
+               snprintf(ftype, sizeof(ftype), "Unknown Frametype '%u'", f->frametype);
        }
        if (!ast_strlen_zero(moreinfo))
-               ast_verbose("%s [ TYPE: %s (%d) SUBCLASS: %s (%d) '%s' ] [%s]\n",  
+               ast_verbose("%s [ TYPE: %s (%u) SUBCLASS: %s (%d) '%s' ] [%s]\n",  
                            term_color(cp, prefix, COLOR_BRMAGENTA, COLOR_BLACK, sizeof(cp)),
                            term_color(cft, ftype, COLOR_BRRED, COLOR_BLACK, sizeof(cft)),
                            f->frametype, 
@@ -971,7 +971,7 @@ void ast_frame_dump(const char *name, struct ast_frame *f, char *prefix)
                            term_color(cmn, moreinfo, COLOR_BRGREEN, COLOR_BLACK, sizeof(cmn)),
                            term_color(cn, name, COLOR_YELLOW, COLOR_BLACK, sizeof(cn)));
        else
-               ast_verbose("%s [ TYPE: %s (%d) SUBCLASS: %s (%d) ] [%s]\n",  
+               ast_verbose("%s [ TYPE: %s (%u) SUBCLASS: %s (%d) ] [%s]\n",  
                            term_color(cp, prefix, COLOR_BRMAGENTA, COLOR_BLACK, sizeof(cp)),
                            term_color(cft, ftype, COLOR_BRRED, COLOR_BLACK, sizeof(cft)),
                            f->frametype, 
@@ -1338,7 +1338,7 @@ static int g723_len(unsigned char buf)
                return 20;
                break;
        default:
-               ast_log(LOG_WARNING, "Badly encoded frame (%d)\n", type);
+               ast_log(LOG_WARNING, "Badly encoded frame (%u)\n", type);
        }
        return -1;
 }
index 1ab15e5fd96d20f500c0486762e78da976d06e81..296f3f9df216509aa989616f2342088877d19166 100644 (file)
--- a/main/io.c
+++ b/main/io.c
@@ -312,7 +312,7 @@ void ast_io_dump(struct io_context *ioc)
         */
        int x;
 
-       ast_debug(1, "Asterisk IO Dump: %d entries, %d max entries\n", ioc->fdcnt, ioc->maxfdcnt);
+       ast_debug(1, "Asterisk IO Dump: %u entries, %u max entries\n", ioc->fdcnt, ioc->maxfdcnt);
        ast_debug(1, "================================================\n");
        ast_debug(1, "| ID    FD     Callback    Data        Events  |\n");
        ast_debug(1, "+------+------+-----------+-----------+--------+\n");
@@ -322,7 +322,7 @@ void ast_io_dump(struct io_context *ioc)
                                ioc->fds[x].fd,
                                ioc->ior[x].callback,
                                ioc->ior[x].data,
-                               ioc->fds[x].events);
+                               (unsigned)ioc->fds[x].events);
        }
        ast_debug(1, "================================================\n");
 }
index bdf40da5d562654746d7de5cef262850cce6507e..c5fb163468c4454da1d554c8a212511fdb30f00e 100644 (file)
@@ -299,7 +299,7 @@ static int printdigest(const unsigned char *d)
        char buf[256]; /* large enough so we don't have to worry */
 
        for (pos = 0, x = 0; x < 16; x++)
-               pos += sprintf(buf + pos, " %02x", *d++);
+               pos += sprintf(buf + pos, " %02x", (unsigned)*d++);
 
        ast_debug(1, "Unexpected signature:%s\n", buf);
 
@@ -1191,7 +1191,7 @@ int load_modules(unsigned int preload_only)
                load_count++;
 
        if (load_count)
-               ast_log(LOG_NOTICE, "%d modules will be loaded.\n", load_count);
+               ast_log(LOG_NOTICE, "%u modules will be loaded.\n", load_count);
 
        /* first, load only modules that provide global symbols */
        if ((res = load_resource_list(&load_order, 1, &modulecount)) < 0) {
index ad7950ccca4b0d30a304f1e472e7b16a68f69147..5e2555a5f3ce9d805d2ce482fa69119d3e635eb7 100644 (file)
@@ -1660,7 +1660,7 @@ int ast_logger_register_level(const char *name)
 
        AST_RWLIST_UNLOCK(&logchannels);
 
-       ast_debug(1, "Registered dynamic logger level '%s' with index %d.\n", name, available);
+       ast_debug(1, "Registered dynamic logger level '%s' with index %u.\n", name, available);
 
        update_logchannels();
 
@@ -1698,7 +1698,7 @@ void ast_logger_unregister_level(const char *name)
                levels[x] = NULL;
                AST_RWLIST_UNLOCK(&logchannels);
 
-               ast_debug(1, "Unregistered dynamic logger level '%s' with index %d.\n", name, x);
+               ast_debug(1, "Unregistered dynamic logger level '%s' with index %u.\n", name, x);
 
                update_logchannels();
        } else {
index 6b67892b32648934bba6699b7924934d81ebf91b..3c47848ea4042c9edcdadacfceb8972ca5f6740a 100644 (file)
@@ -2455,7 +2455,7 @@ static int authenticate(struct mansession *s, const struct message *m)
                        MD5Update(&md5, (unsigned char *) user->secret, strlen(user->secret));
                        MD5Final(digest, &md5);
                        for (x = 0; x < 16; x++)
-                               len += sprintf(md5key + len, "%2.2x", digest[x]);
+                               len += sprintf(md5key + len, "%2.2x", (unsigned)digest[x]);
                        if (!strcmp(md5key, key)) {
                                error = 0;
                        } else {
@@ -3378,7 +3378,7 @@ static int action_status(struct mansession *s, const struct message *m)
                        "ConnectedLineNum: %s\r\n"
                        "ConnectedLineName: %s\r\n"
                        "Accountcode: %s\r\n"
-                       "ChannelState: %d\r\n"
+                       "ChannelState: %u\r\n"
                        "ChannelStateDesc: %s\r\n"
                        "Context: %s\r\n"
                        "Extension: %s\r\n"
@@ -4610,7 +4610,7 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m
                        "Context: %s\r\n"
                        "Extension: %s\r\n"
                        "Priority: %d\r\n"
-                       "ChannelState: %d\r\n"
+                       "ChannelState: %u\r\n"
                        "ChannelStateDesc: %s\r\n"
                        "Application: %s\r\n"
                        "ApplicationData: %s\r\n"
@@ -5368,7 +5368,7 @@ int ast_manager_unregister(char *action)
                while (cur->active_count) {
                        if (5 <= time(NULL) - now) {
                                ast_debug(1,
-                                       "Unregister manager action %s timed out waiting for %d active instances to complete\n",
+                                       "Unregister manager action %s timed out waiting for %u active instances to complete\n",
                                        action, cur->active_count);
                                break;
                        }
index 4f2a4add697d5e076342dfb5cbbcb5bf37376ab8..686213472d484e2a53f4fe7368d19accd25c2190 100644 (file)
@@ -228,10 +228,10 @@ char *ast_eid_to_str(char *s, int maxlen, struct ast_eid *eid)
                        *s = '\0';
        } else {
                for (x = 0; x < 5; x++) {
-                       sprintf(s, "%02x:", eid->eid[x]);
+                       sprintf(s, "%02x:", (unsigned)eid->eid[x]);
                        s += 3;
                }
-               sprintf(s, "%02x", eid->eid[5]);
+               sprintf(s, "%02x", (unsigned)eid->eid[5]);
        }
        return os;
 }
@@ -263,7 +263,7 @@ void ast_set_default_eid(struct ast_eid *eid)
                        /* Try pciX#[1..N] */
                        for (i = 0; i < MAXIF; i++) {
                                memset(&ifr, 0, sizeof(ifr));
-                               snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "pci%u#%u", x, i);
+                               snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "pci%d#%u", x, i);
                                if (!ioctl(s, SIOCGIFHWADDR, &ifr)) {
                                        break;
                                }
index f3746333a40f0c7b11d548fb0c92983ace183867..ad87f4ea7de0087a3c69591a28246b1b4a9812b8 100644 (file)
@@ -3476,7 +3476,7 @@ const char *ast_str_retrieve_variable(struct ast_str **str, ssize_t maxlen, stru
        }
        if (s == &not_found) { /* look for more */
                if (!strcmp(var, "EPOCH")) {
-                       ast_str_set(str, maxlen, "%u", (int) time(NULL));
+                       ast_str_set(str, maxlen, "%d", (int) time(NULL));
                        s = ast_str_buffer(*str);
                } else if (!strcmp(var, "SYSTEMNAME")) {
                        s = ast_config_AST_SYSTEM_NAME;
index 646aa2dfda2f29ab9ab73d91b4d24376a9db46b8..eecaa08454c6bd0c6d0fcace03be3923cddadff8 100644 (file)
@@ -1631,7 +1631,7 @@ char *ast_rtp_instance_get_quality(struct ast_rtp_instance *instance, enum ast_r
 
        /* Now actually fill the buffer with the good information */
        if (field == AST_RTP_INSTANCE_STAT_FIELD_QUALITY) {
-               snprintf(buf, size, "ssrc=%i;themssrc=%u;lp=%u;rxjitter=%f;rxcount=%u;txjitter=%f;txcount=%u;rlp=%u;rtt=%f",
+               snprintf(buf, size, "ssrc=%u;themssrc=%u;lp=%u;rxjitter=%f;rxcount=%u;txjitter=%f;txcount=%u;rlp=%u;rtt=%f",
                         stats.local_ssrc, stats.remote_ssrc, stats.rxploss, stats.rxjitter, stats.rxcount, stats.txjitter, stats.txcount, stats.txploss, stats.rtt);
        } else if (field == AST_RTP_INSTANCE_STAT_FIELD_QUALITY_JITTER) {
                snprintf(buf, size, "minrxjitter=%f;maxrxjitter=%f;avgrxjitter=%f;stdevrxjitter=%f;reported_minjitter=%f;reported_maxjitter=%f;reported_avgjitter=%f;reported_stdevjitter=%f;",
index afef6beb37b44ffc98abe29aa5d02bfabf9b19d3..9b18a580e7c7280f803e425bd2a5987dcf40966e 100644 (file)
@@ -532,7 +532,7 @@ void ast_sched_report(struct sched_context *con, struct ast_str **buf, struct as
        size_t heap_size;
        
        memset(countlist, 0, sizeof(countlist));
-       ast_str_set(buf, 0, " Highwater = %d\n schedcnt = %d\n", con->highwater, con->schedcnt);
+       ast_str_set(buf, 0, " Highwater = %u\n schedcnt = %u\n", con->highwater, con->schedcnt);
 
        ast_mutex_lock(&con->lock);
 
@@ -569,9 +569,9 @@ void ast_sched_dump(struct sched_context *con)
        int x;
        size_t heap_size;
 #ifdef SCHED_MAX_CACHE
-       ast_debug(1, "Asterisk Schedule Dump (%d in Q, %d Total, %d Cache, %d high-water)\n", con->schedcnt, con->eventcnt - 1, con->schedccnt, con->highwater);
+       ast_debug(1, "Asterisk Schedule Dump (%u in Q, %u Total, %u Cache, %u high-water)\n", con->schedcnt, con->eventcnt - 1, con->schedccnt, con->highwater);
 #else
-       ast_debug(1, "Asterisk Schedule Dump (%d in Q, %d Total, %d high-water)\n", con->schedcnt, con->eventcnt - 1, con->highwater);
+       ast_debug(1, "Asterisk Schedule Dump (%u in Q, %u Total, %u high-water)\n", con->schedcnt, con->eventcnt - 1, con->highwater);
 #endif
 
        ast_debug(1, "=============================================================\n");
index 43a683015805a74d4940e7dcedfd2c340336e91c..723446444c281add938e32838ccc0be3fd1640c1 100644 (file)
@@ -511,7 +511,7 @@ static int add_ie(struct ast_event **event, const struct ast_security_event_comm
 
                if (req && !str) {
                        ast_log(LOG_WARNING, "Required IE '%d' for security event "
-                                       "type '%d' not present\n", ie_type->ie_type,
+                                       "type '%u' not present\n", ie_type->ie_type,
                                        sec->event_type);
                        res = -1;
                }
@@ -539,7 +539,7 @@ static int add_ie(struct ast_event **event, const struct ast_security_event_comm
 
                if (req && !addr->sin) {
                        ast_log(LOG_WARNING, "Required IE '%d' for security event "
-                                       "type '%d' not present\n", ie_type->ie_type,
+                                       "type '%u' not present\n", ie_type->ie_type,
                                        sec->event_type);
                        res = -1;
                }
@@ -557,7 +557,7 @@ static int add_ie(struct ast_event **event, const struct ast_security_event_comm
 
                if (req && !tval) {
                        ast_log(LOG_WARNING, "Required IE '%d' for security event "
-                                       "type '%d' not present\n", ie_type->ie_type,
+                                       "type '%u' not present\n", ie_type->ie_type,
                                        sec->event_type);
                        res = -1;
                }
index bf60e3ab729b2d9a35e0d0b352081bf4cdc119d4..51b21c89d728c19b73c6d4031fc21f0e0777b497 100644 (file)
@@ -294,7 +294,7 @@ static void *inotify_daemon(void *data)
                /* This read should block, most of the time. */
                if ((res = read(inotify_fd, &buf, sizeof(buf))) < sizeof(buf.iev) && res > 0) {
                        /* This should never happen */
-                       ast_log(LOG_ERROR, "Inotify read less than a full event (%zd < %zd)?!!\n", res, sizeof(buf.iev));
+                       ast_log(LOG_ERROR, "Inotify read less than a full event (%zd < %zu)?!!\n", res, sizeof(buf.iev));
                        break;
                } else if (res < 0) {
                        if (errno == EINTR || errno == EAGAIN) {
index 7203f270c666ee4c2d8edf2d45516c829675a921..016005c6f0f21b1e277ecff95c8dd8ee8a61a5c6 100644 (file)
@@ -182,7 +182,7 @@ static int stun_process_attr(struct stun_state *state, struct stun_attr *attr)
 {
        if (stundebug)
                ast_verbose("Found STUN Attribute %s (%04x), length %d\n",
-                           stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr), ntohs(attr->len));
+                           stun_attr2str(ntohs(attr->attr)), (unsigned)ntohs(attr->attr), ntohs(attr->len));
        switch (ntohs(attr->attr)) {
        case STUN_USERNAME:
                state->username = (const char *) (attr->value);
@@ -193,7 +193,7 @@ static int stun_process_attr(struct stun_state *state, struct stun_attr *attr)
        default:
                if (stundebug)
                        ast_verbose("Ignoring STUN attribute %s (%04x), length %d\n",
-                                   stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr), ntohs(attr->len));
+                                   stun_attr2str(ntohs(attr->attr)), (unsigned)ntohs(attr->attr), ntohs(attr->len));
        }
        return 0;
 }
@@ -281,7 +281,7 @@ int ast_stun_handle_packet(int s, struct sockaddr_in *src, unsigned char *data,
        data += sizeof(struct stun_header);
        x = ntohs(hdr->msglen); /* len as advertised in the message */
        if (stundebug)
-               ast_verbose("STUN Packet, msg %s (%04x), length: %d\n", stun_msg2str(ntohs(hdr->msgtype)), ntohs(hdr->msgtype), x);
+               ast_verbose("STUN Packet, msg %s (%04x), length: %d\n", stun_msg2str(ntohs(hdr->msgtype)), (unsigned)ntohs(hdr->msgtype), x);
        if (x > len) {
                ast_debug(1, "Scrambled STUN packet length (got %d, expecting %d)\n", x, (int)len);
        } else
@@ -302,7 +302,7 @@ int ast_stun_handle_packet(int s, struct sockaddr_in *src, unsigned char *data,
                if (stun_cb)
                        stun_cb(attr, arg);
                if (stun_process_attr(&st, attr)) {
-                       ast_debug(1, "Failed to handle attribute %s (%04x)\n", stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr));
+                       ast_debug(1, "Failed to handle attribute %s (%04x)\n", stun_attr2str(ntohs(attr->attr)), (unsigned)ntohs(attr->attr));
                        break;
                }
                /* Clear attribute id: in case previous entry was a string,
@@ -348,7 +348,7 @@ int ast_stun_handle_packet(int s, struct sockaddr_in *src, unsigned char *data,
                        break;
                default:
                        if (stundebug)
-                               ast_verbose("Dunno what to do with STUN message %04x (%s)\n", ntohs(hdr->msgtype), stun_msg2str(ntohs(hdr->msgtype)));
+                               ast_verbose("Dunno what to do with STUN message %04x (%s)\n", (unsigned)ntohs(hdr->msgtype), stun_msg2str(ntohs(hdr->msgtype)));
                }
        }
        return ret;
index 391432d1c5ab255f89ddfa70c776b33231e1f8a9..54126eb3115ca3392f071080bedc577fcd55a906 100644 (file)
@@ -279,7 +279,7 @@ static char *cli_tps_report(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
                qsize = p->tps_queue_size;
                maxqsize = p->stats->max_qsize;
                processed = p->stats->_tasks_processed_count;
-               ast_cli(a->fd, "\n%24s   %17ld %12ld %12ld", name, processed, qsize, maxqsize);
+               ast_cli(a->fd, "\n%24s   %17lu %12lu %12lu", name, processed, qsize, maxqsize);
                ao2_ref(p, -1);
        }
        ao2_iterator_destroy(&i);
index ac5a8b9782b097c5a75a46b1bc6babfc3cedc4e8..3ec3b966e70ed01ca78eda27ca6af074ff1dd731 100644 (file)
@@ -384,7 +384,7 @@ struct ast_frame *ast_translate(struct ast_trans_pvt *path, struct ast_frame *f,
                           frame. */
                        path->nextout = ast_tvadd(path->nextout, ast_samp2tv(out->samples, ast_format_rate(out->subclass.codec)));
                        if (f->samples != out->samples && ast_test_flag(out, AST_FRFLAG_HAS_TIMING_INFO)) {
-                               ast_debug(4, "Sample size different %u vs %u\n", f->samples, out->samples);
+                               ast_debug(4, "Sample size different %d vs %d\n", f->samples, out->samples);
                                ast_clear_flag(out, AST_FRFLAG_HAS_TIMING_INFO);
                        }
                } else {
@@ -616,7 +616,7 @@ static void rebuild_matrix(int samples)
                                         * then this is a up sample down sample conversion scenario. */
                                        tr_matrix[x][z].rate_change = tr_matrix[x][y].rate_change + tr_matrix[y][z].rate_change;
 
-                                       ast_debug(10, "Discovered %d cost path from %s to %s, via %s\n", tr_matrix[x][z].cost,
+                                       ast_debug(10, "Discovered %u cost path from %s to %s, via %s\n", tr_matrix[x][z].cost,
                                                  ast_getformatname(1LL << x), ast_getformatname(1LL << z), ast_getformatname(1LL << y));
                                        changed++;
                                }
@@ -823,7 +823,7 @@ static char *handle_cli_core_show_translation(struct ast_cli_entry *e, int cmd,
                                curlen = 5;
                        if (x >= 0 && y >= 0 && tr_matrix[x][y].step) {
                                /* Actual codec output */
-                               ast_str_append(&out, -1, "%*d", curlen + 1, tr_matrix[x][y].cost);
+                               ast_str_append(&out, -1, "%*u", curlen + 1, tr_matrix[x][y].cost);
                        } else if (x == -1 && y >= 0) {
                                /* Top row - use a dynamic size */
                                ast_str_append(&out, -1, "%*s", curlen + 1, ast_getformatname(1LL << (y)) );
index d874c23df95d4e70eb2cf6d70992d1c348d18352..8885d7abcd5812cf4614668a3d55b065c14cc70f 100644 (file)
@@ -291,7 +291,7 @@ static int encode_open_type(const struct ast_udptl *udptl, uint8_t *buf, unsigne
                if ((enclen = encode_length(buf, len, num_octets)) < 0)
                        return -1;
                if (enclen + *len > buflen) {
-                       ast_log(LOG_ERROR, "UDPTL (%s): Buffer overflow detected (%d + %d > %d)\n",
+                       ast_log(LOG_ERROR, "UDPTL (%s): Buffer overflow detected (%u + %u > %u)\n",
                                LOG_TAG(udptl), enclen, *len, buflen);
                        return -1;
                }
@@ -369,7 +369,7 @@ static int udptl_rx_packet(struct ast_udptl *s, uint8_t *buf, unsigned int len)
                                if (seq_no - i >= s->rx_seq_no) {
                                        /* This one wasn't seen before */
                                        /* Decode the secondary IFP packet */
-                                       ast_debug(3, "Recovering lost packet via secondary %d, len %d\n", seq_no - i, lengths[i - 1]);
+                                       ast_debug(3, "Recovering lost packet via secondary %d, len %u\n", seq_no - i, lengths[i - 1]);
                                        s->f[ifp_no].frametype = AST_FRAME_MODEM;
                                        s->f[ifp_no].subclass.codec = AST_MODEM_T38;
 
@@ -1075,7 +1075,7 @@ int ast_udptl_write(struct ast_udptl *s, struct ast_frame *f)
 
        if (len > s->far_max_ifp) {
                ast_log(LOG_WARNING,
-                       "UDPTL (%s): UDPTL asked to send %d bytes of IFP when far end only prepared to accept %d bytes; data loss will occur."
+                       "UDPTL (%s): UDPTL asked to send %u bytes of IFP when far end only prepared to accept %d bytes; data loss will occur."
                        "You may need to override the T38FaxMaxDatagram value for this endpoint in the channel driver configuration.\n",
                        LOG_TAG(s), len, s->far_max_ifp);
                len = s->far_max_ifp;
@@ -1092,7 +1092,7 @@ int ast_udptl_write(struct ast_udptl *s, struct ast_frame *f)
                        ast_log(LOG_NOTICE, "UDPTL (%s): Transmission error to %s: %s\n",
                                LOG_TAG(s), ast_sockaddr_stringify(&s->them), strerror(errno));
                if (udptl_debug_test_addr(&s->them))
-                       ast_verb(1, "UDPTL (%s): packet to %s (seq %d, len %d)\n",
+                       ast_verb(1, "UDPTL (%s): packet to %s (seq %u, len %u)\n",
                                LOG_TAG(s), ast_sockaddr_stringify(&s->them), seq, len);
        }
                
index 7c42beb16ee6b7543eb86c0e8045ed49da2dfb16..5b9aee7da2cc9e566a910ec03eb732c29f69df64 100644 (file)
@@ -254,7 +254,7 @@ void ast_md5_hash(char *output, const char *input)
        MD5Final(digest, &md5);
        ptr = output;
        for (x = 0; x < 16; x++)
-               ptr += sprintf(ptr, "%2.2x", digest[x]);
+               ptr += sprintf(ptr, "%2.2x", (unsigned)digest[x]);
 }
 
 /*! \brief Produce 40 char SHA1 hash of value. */
@@ -272,7 +272,7 @@ void ast_sha1_hash(char *output, const char *input)
        SHA1Result(&sha, Message_Digest);
        ptr = output;
        for (x = 0; x < 20; x++)
-               ptr += sprintf(ptr, "%2.2x", Message_Digest[x]);
+               ptr += sprintf(ptr, "%2.2x", (unsigned)Message_Digest[x]);
 }
 
 /*! \brief decode BASE64 encoded text */
@@ -412,7 +412,7 @@ char *ast_uri_encode(const char *string, char *outbuf, int buflen, int do_specia
                                break;
                        }
 
-                       out += sprintf(out, "%%%02X", (unsigned char) *ptr);
+                       out += sprintf(out, "%%%02X", (unsigned) *ptr);
                } else {
                        *out = *ptr;    /* Continue copying the string */
                        out++;
index eeefdb3cad3865999930118c3154b16ddf8d5b34..0cb3db9c46b74fbfe0431b81b105c4f7e998c0b0 100644 (file)
@@ -2010,7 +2010,7 @@ int ast_xmldoc_load_documentation(void)
        globret = glob(xmlpattern, MY_GLOB_FLAGS, NULL, &globbuf);
 #endif
 
-       ast_debug(3, "gl_pathc %zd\n", globbuf.gl_pathc);
+       ast_debug(3, "gl_pathc %zu\n", globbuf.gl_pathc);
        if (globret == GLOB_NOSPACE) {
                ast_log(LOG_WARNING, "XML load failure, glob expansion of pattern '%s' failed: Not enough memory\n", xmlpattern);
                ast_free(xmlpattern);
index 0bf23e6061e0d03521506c8ecb4a13f19c497e07..e89da1223f8d91a5718f35969db051c47e3f1875 100644 (file)
@@ -61,7 +61,7 @@ char *dundi_eid_to_str_short(char *s, int maxlen, dundi_eid *eid)
                        *s = '\0';
        } else {
                for (x=0;x<6;x++) {
-                       sprintf(s, "%02X", eid->eid[x]);
+                       sprintf(s, "%02X", (unsigned)eid->eid[x]);
                        s += 2;
                }
        }
@@ -320,7 +320,7 @@ static void dump_encrypted(char *output, int maxlen, void *value, int len)
        if ((len > 16) && !(len % 16)) {
                /* Build up IV */
                for (x=0;x<16;x++) {
-                       snprintf(iv + (x << 1), 3, "%02x", ((unsigned char *)value)[x]);
+                       snprintf(iv + (x << 1), 3, "%02x", (unsigned)((unsigned char *)value)[x]);
                }
                snprintf(output, maxlen, "[IV %s] %d encrypted blocks\n", iv, len / 16);
        } else
@@ -334,7 +334,7 @@ static void dump_raw(char *output, int maxlen, void *value, int len)
        output[maxlen - 1] = '\0';
        strcpy(output, "[ ");
        for (x=0;x<len;x++) {
-               snprintf(output + strlen(output), maxlen - strlen(output) - 1, "%02x ", u[x]);
+               snprintf(output + strlen(output), maxlen - strlen(output) - 1, "%02x ", (unsigned)u[x]);
        }
        strncat(output + strlen(output), "]", maxlen - strlen(output) - 1);
 }
@@ -465,7 +465,7 @@ void dundi_showframe(struct dundi_hdr *fhi, int rx, struct sockaddr_in *sin, int
        } else {
                class = commands[(int)(fhi->cmdresp & 0x3f)];
        }
-       snprintf(subclass2, (int)sizeof(subclass2), "%02x", fhi->cmdflags);
+       snprintf(subclass2, (int)sizeof(subclass2), "%02x", (unsigned)fhi->cmdflags);
        subclass = subclass2;
        snprintf(tmp, (int)sizeof(tmp), 
                "%s-Frame Retry[%s] -- OSeqno: %3.3d ISeqno: %3.3d Type: %s (%s)\n",
index 1a65396582e4618f4bdc9e60fed3cfd7dd5879e9..4929fa2094d624b95b653eac95b918866f235517 100644 (file)
@@ -501,7 +501,7 @@ static char *complete_dialplan_remove_extension(struct ast_cli_args *a)
                                /* XXX lock e ? */
                                priority = NULL;
                                while ( !ret && (priority = ast_walk_extension_priorities(e, priority)) ) {
-                                       snprintf(buffer, sizeof(buffer), "%u", ast_get_extension_priority(priority));
+                                       snprintf(buffer, sizeof(buffer), "%d", ast_get_extension_priority(priority));
                                        if (partial_match(buffer, a->word, len) && ++which > a->n) /* n-th match */
                                                ret = strdup(buffer);
                                }
index 07ef4d0ae8676d4fadc676fdb9d2df87ef471ce2..2883dba0ca9e658d99738b054b029bd4fed422ab 100644 (file)
@@ -910,7 +910,7 @@ static int cache_save(dundi_eid *eidpeer, struct dundi_request *req, int start,
                /* Skip anything with an illegal pipe in it */
                if (strchr(req->dr[x].dest, '|'))
                        continue;
-               snprintf(data + strlen(data), sizeof(data) - strlen(data), "%d/%d/%d/%s/%s|",
+               snprintf(data + strlen(data), sizeof(data) - strlen(data), "%u/%d/%d/%s/%s|",
                        req->dr[x].flags, req->dr[x].weight, req->dr[x].techint, req->dr[x].dest,
                        dundi_eid_to_str_short(eidpeer_str, sizeof(eidpeer_str), &req->dr[x].eid));
        }
@@ -1169,7 +1169,7 @@ static int cache_lookup_internal(time_t now, struct dundi_request *req, char *ke
                        if (expiration > 0) {
                                ast_debug(1, "Found cache expiring in %d seconds!\n", expiration);
                                ptr += length + 1;
-                               while((sscanf(ptr, "%30d/%30d/%30d/%n", &(flags.flags), &weight, &tech, &length) == 3)) {
+                               while((sscanf(ptr, "%30d/%30d/%30d/%n", (int *)&(flags.flags), &weight, &tech, &length) == 3)) {
                                        ptr += length;
                                        term = strchr(ptr, '|');
                                        if (term) {
@@ -1239,7 +1239,7 @@ static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, uint32_t
        ast_eid_to_str(eid_str_full, sizeof(eid_str_full), peer_eid);
        snprintf(key, sizeof(key), "%s/%s/%s/e%08x", eid_str, req->number, req->dcontext, crc32);
        res |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
-       snprintf(key, sizeof(key), "%s/%s/%s/e%08x", eid_str, req->number, req->dcontext, 0);
+       snprintf(key, sizeof(key), "%s/%s/%s/e%08x", eid_str, req->number, req->dcontext, (unsigned)0);
        res |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
        snprintf(key, sizeof(key), "%s/%s/%s/r%s", eid_str, req->number, req->dcontext, eidroot_str);
        res |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
@@ -1254,7 +1254,7 @@ static int cache_lookup(struct dundi_request *req, dundi_eid *peer_eid, uint32_t
                        /* Check for hints */
                        snprintf(key, sizeof(key), "hint/%s/%s/%s/e%08x", eid_str, tmp, req->dcontext, crc32);
                        res2 |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
-                       snprintf(key, sizeof(key), "hint/%s/%s/%s/e%08x", eid_str, tmp, req->dcontext, 0);
+                       snprintf(key, sizeof(key), "hint/%s/%s/%s/e%08x", eid_str, tmp, req->dcontext, (unsigned)0);
                        res2 |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
                        snprintf(key, sizeof(key), "hint/%s/%s/%s/r%s", eid_str, tmp, req->dcontext, eidroot_str);
                        res2 |= cache_lookup_internal(now, req, key, eid_str_full, lowexpiration);
index dc05cf7f1599c9a76a4617b87baabbbde3c9bedf..c0da0f03ff725780a9b64d6b6702cad5a8343f8d 100644 (file)
@@ -1388,7 +1388,7 @@ static void find_pval_goto_item(pval *item, int lev)
        struct pval *p4;
        
        if (lev>100) {
-               ast_log(LOG_ERROR,"find_pval_goto in infinite loop! item_type: %d\n\n", item->type);
+               ast_log(LOG_ERROR,"find_pval_goto in infinite loop! item_type: %u\n\n", item->type);
                return;
        }
        
index 1a35355147479fdd8bd9be82a161a64136098f1d..b17d1217679e16bd8e9abb1c4a9f90f1e7dede55 100644 (file)
@@ -2535,12 +2535,12 @@ static int handle_channelstatus(struct ast_channel *chan, AGI *agi, int argc, co
        struct ast_channel *c;
        if (argc == 2) {
                /* no argument: supply info on the current channel */
-               ast_agi_send(agi->fd, chan, "200 result=%d\n", chan->_state);
+               ast_agi_send(agi->fd, chan, "200 result=%u\n", chan->_state);
                return RESULT_SUCCESS;
        } else if (argc == 3) {
                /* one argument: look for info on the specified channel */
                if ((c = ast_channel_get_by_name(argv[2]))) {
-                       ast_agi_send(agi->fd, chan, "200 result=%d\n", c->_state);
+                       ast_agi_send(agi->fd, chan, "200 result=%u\n", c->_state);
                        c = ast_channel_unref(c);
                        return RESULT_SUCCESS;
                }
index a28700b5c228f2ad20567900dcadbe9016b806d5..a1951e758bd693bcded96b09505f910b78afc382 100644 (file)
@@ -651,7 +651,7 @@ static void *event_notification_duplicate(void *data)
 /*! \brief Generate 32 byte random string (stolen from chan_sip.c)*/
 static char *generate_random_string(char *buf, size_t size)
 {
-       long val[4];
+       unsigned long val[4];
        int x;
 
        for (x = 0; x < 4; x++) {
@@ -1303,7 +1303,7 @@ static int calendar_query_result_exec(struct ast_channel *chan, const char *cmd,
                } else if (!strcasecmp(args.field, "end")) {
                        snprintf(buf, len, "%ld", (long) entry->event->end);
                } else if (!strcasecmp(args.field, "busystate")) {
-                       snprintf(buf, len, "%d", entry->event->busy_state);
+                       snprintf(buf, len, "%u", entry->event->busy_state);
                } else if (!strcasecmp(args.field, "attendees")) {
                        calendar_join_attendees(entry->event, buf, len);
                } else {
@@ -1364,7 +1364,7 @@ static int calendar_write_exec(struct ast_channel *chan, const char *cmd, char *
        }
 
        if (fields.argc - 1 != values.argc) {
-               ast_log(LOG_WARNING, "CALENDAR_WRITE should have the same number of fields (%d) and values (%d)!\n", fields.argc - 1, values.argc);
+               ast_log(LOG_WARNING, "CALENDAR_WRITE should have the same number of fields (%u) and values (%u)!\n", fields.argc - 1, values.argc);
                goto write_cleanup;
        }
 
@@ -1629,7 +1629,7 @@ static int calendar_event_read(struct ast_channel *chan, const char *cmd, char *
        } else if (!strcasecmp(data, "end")) {
                snprintf(buf, len, "%ld", (long)event->end);
        } else if (!strcasecmp(data, "busystate")) {
-               snprintf(buf, len, "%d", event->busy_state);
+               snprintf(buf, len, "%u", event->busy_state);
        } else if (!strcasecmp(data, "attendees")) {
                calendar_join_attendees(event, buf, len);
        }
index 0a168a69941017803d4bb24a96a4e4d36b7976f4..4abcd2b4752b1138429b1dd240dba46e212f85f2 100644 (file)
@@ -194,7 +194,10 @@ static int caldav_write_event(struct ast_calendar_event *event)
                for (x = 0; x < 8; x++) {
                        val[x] = ast_random();
                }
-               ast_string_field_build(event, uid, "%04x%04x-%04x-%04x-%04x-%04x%04x%04x", val[0], val[1], val[2], val[3], val[4], val[5], val[6], val[7]);
+               ast_string_field_build(event, uid, "%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
+                       (unsigned)val[0], (unsigned)val[1], (unsigned)val[2],
+                       (unsigned)val[3], (unsigned)val[4], (unsigned)val[5],
+                       (unsigned)val[6], (unsigned)val[7]);
        }
 
        calendar = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
@@ -389,7 +392,7 @@ static void caldav_add_event(icalcomponent *comp, struct icaltime_span *span, vo
                        ast_string_field_set(event, uid, event->summary);
                } else {
                        char tmp[100];
-                       snprintf(tmp, sizeof(tmp), "%lu", event->start);
+                       snprintf(tmp, sizeof(tmp), "%ld", event->start);
                        ast_string_field_set(event, uid, tmp);
                }
        }
index 3cf0d745eb735ad283a49ded47bd34b5829a9c66..3baee4785cd286539f339ac693424db126815450 100644 (file)
@@ -456,7 +456,7 @@ static int endelm(void *userdata, int state, const char *nspace, const char *nam
                }
        } else if (!strcmp(name, "Envelope")) {
                /* Events end */
-               ast_debug(3, "EWS: XML: %d of %d event(s) has been parsed…\n", ao2_container_count(ctx->pvt->events), ctx->pvt->items);
+               ast_debug(3, "EWS: XML: %d of %u event(s) has been parsed…\n", ao2_container_count(ctx->pvt->events), ctx->pvt->items);
                if (ao2_container_count(ctx->pvt->events) >= ctx->pvt->items) {
                        ast_debug(3, "EWS: XML: All events has been parsed, merging…\n");
                        ast_calendar_merge_events(ctx->pvt->owner, ctx->pvt->events);
index 968686293b3d76033798b06f7ac4e4dcddfdce11..95e78c52a70c3d55ea65bebaab2d7bc49e443a45 100644 (file)
@@ -247,7 +247,9 @@ static struct ast_str *generate_exchange_uuid(struct ast_str *uid)
        for (x = 0; x < 8; x++) {
                val[x] = ast_random();
        }
-       ast_str_set(&uid, 0, "%04x%04x-%04x-%04x-%04x-%04x%04x%04x", val[0], val[1], val[2], val[3], val[4], val[5], val[6], val[7]);
+       ast_str_set(&uid, 0, "%04x%04x-%04x-%04x-%04x-%04x%04x%04x", (unsigned)val[0],
+               (unsigned)val[1], (unsigned)val[2], (unsigned)val[3], (unsigned)val[4],
+               (unsigned)val[5], (unsigned)val[6], (unsigned)val[7]);
 
        return uid;
 }
index 7ee22f5c749e9f21847d17e6810f5882b60a9181..f6ab134c2bacbd35783c3f83577b54afd58f0843 100644 (file)
@@ -245,7 +245,7 @@ static void icalendar_add_event(icalcomponent *comp, struct icaltime_span *span,
                        ast_string_field_set(event, uid, event->summary);
                } else {
                        char tmp[100];
-                       snprintf(tmp, sizeof(tmp), "%lu", event->start);
+                       snprintf(tmp, sizeof(tmp), "%ld", event->start);
                        ast_string_field_set(event, uid, tmp);
                }
        }
index eaf6deac277555bea1260fd895874b8197c2f60a..739d4be1be1f2d698a7df52c77fb04682fab7192 100644 (file)
@@ -83,7 +83,7 @@ static void decode_chunk(char *chunk)
 {
        for (; *chunk; chunk++) {
                if (*chunk == '^' && strchr("0123456789ABCDEF", chunk[1]) && strchr("0123456789ABCDEF", chunk[2])) {
-                       sscanf(chunk + 1, "%02hhX", chunk);
+                       sscanf(chunk + 1, "%02hhX", (unsigned char *)chunk);
                        memmove(chunk + 1, chunk + 3, strlen(chunk + 3) + 1);
                }
        }
@@ -110,7 +110,7 @@ static SQLHSTMT custom_prepare(struct odbc_obj *obj, void *data)
                return NULL;
        }
 
-       ast_debug(1, "Skip: %lld; SQL: %s\n", cps->skip, cps->sql);
+       ast_debug(1, "Skip: %llu; SQL: %s\n", cps->skip, cps->sql);
 
        res = SQLPrepare(stmt, (unsigned char *)cps->sql, SQL_NTS);
        if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
@@ -123,7 +123,7 @@ static SQLHSTMT custom_prepare(struct odbc_obj *obj, void *data)
        while ((newparam = va_arg(ap, const char *))) {
                newval = va_arg(ap, const char *);
                if ((1LL << count++) & cps->skip) {
-                       ast_debug(1, "Skipping field '%s'='%s' (%llo/%llo)\n", newparam, newval, 1LL << (count - 1), cps->skip);
+                       ast_debug(1, "Skipping field '%s'='%s' (%llo/%llo)\n", newparam, newval, 1ULL << (count - 1), cps->skip);
                        continue;
                }
                ast_debug(1, "Parameter %d ('%s') = '%s'\n", x, newparam, newval);
index 7c38e3d28b339fece02603486b1481cad27f0066..588e0de3ba693828ead92197c3f6071aba964585 100644 (file)
@@ -532,7 +532,7 @@ static void md52sum(char *sum, unsigned char *md5)
 {
        int x;
        for (x = 0; x < 16; x++) {
-               sum += sprintf(sum, "%02x", *(md5++));
+               sum += sprintf(sum, "%02x", (unsigned)*(md5++));
        }
 }
 
index 2656ac60777828d7dc694e1c69f56b6a6d82e62f..19b5e2acc0e91d3285c0c18f2b1a9618c86cfe4d 100644 (file)
@@ -322,7 +322,7 @@ static void debug_check_frame_for_silence(struct ast_fax_session *s, unsigned in
                history->consec_ms = 0;
 
                if ((last_consec_frames != 0)) {
-                       ast_verb(6, "Channel '%s' fax session '%d', [ %.3ld.%.6ld ], %s sent %d frames (%d ms) of %s.\n",
+                       ast_verb(6, "Channel '%s' fax session '%u', [ %.3ld.%.6ld ], %s sent %u frames (%u ms) of %s.\n",
                                 s->channame, s->id, (long) diff.tv_sec, (long int) diff.tv_usec,
                                 (c2s) ? "channel" : "stack", last_consec_frames, last_consec_ms,
                                 (wassil) ? "silence" : "energy");
@@ -672,7 +672,7 @@ const char *ast_fax_state_to_str(enum ast_fax_state state)
        case AST_FAX_STATE_INACTIVE:
                return "Inactive";
        default:
-               ast_log(LOG_WARNING, "unhandled FAX state: %d\n", state);
+               ast_log(LOG_WARNING, "unhandled FAX state: %u\n", state);
                return "Unknown";
        }
 }
@@ -892,11 +892,11 @@ static struct ast_fax_session *fax_session_new(struct ast_fax_session_details *d
        }
        /* link the session to the session container */
        if (!(ao2_link(faxregistry.container, s))) {
-               ast_log(LOG_ERROR, "failed to add FAX session '%d' to container.\n", s->id);
+               ast_log(LOG_ERROR, "failed to add FAX session '%u' to container.\n", s->id);
                ao2_ref(s, -1);
                return NULL;
        }
-       ast_debug(4, "channel '%s' using FAX session '%d'\n", s->channame, s->id);
+       ast_debug(4, "channel '%s' using FAX session '%u'\n", s->channame, s->id);
 
        return s;
 }
@@ -1004,7 +1004,7 @@ static void set_channel_variables(struct ast_channel *chan, struct ast_fax_sessi
        pbx_builtin_setvar_helper(chan, "FAXBITRATE", S_OR(details->transfer_rate, NULL));
        pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", S_OR(details->resolution, NULL));
 
-       snprintf(buf, sizeof(buf), "%d", details->pages_transferred);
+       snprintf(buf, sizeof(buf), "%u", details->pages_transferred);
        pbx_builtin_setvar_helper(chan, "FAXPAGES", buf);
 }
 
@@ -1026,7 +1026,7 @@ static void set_channel_variables(struct ast_channel *chan, struct ast_fax_sessi
 
 #define GENERIC_FAX_EXEC_ERROR(fax, chan, errorstr, reason)    \
        do {    \
-               ast_log(LOG_ERROR, "channel '%s' FAX session '%d' failure, reason: '%s' (%s)\n", chan->name, fax->id, reason, errorstr); \
+               ast_log(LOG_ERROR, "channel '%s' FAX session '%u' failure, reason: '%s' (%s)\n", chan->name, fax->id, reason, errorstr); \
                GENERIC_FAX_EXEC_ERROR_QUIET(fax, chan, errorstr, reason); \
        } while (0)
 
@@ -1222,7 +1222,7 @@ static int generic_fax_exec(struct ast_channel *chan, struct ast_fax_session_det
                        fax->smoother = NULL;
                }
                if (!(fax->smoother = ast_smoother_new(320))) {
-                       ast_log(LOG_WARNING, "Channel '%s' FAX session '%d' failed to obtain a smoother.\n", chan->name, fax->id);
+                       ast_log(LOG_WARNING, "Channel '%s' FAX session '%u' failed to obtain a smoother.\n", chan->name, fax->id);
                }
        } else {
                expected_frametype = AST_FRAME_MODEM;
@@ -1310,7 +1310,7 @@ static int generic_fax_exec(struct ast_channel *chan, struct ast_fax_session_det
                                        
                                        report_fax_status(chan, details, "T.38 Negotiated");
                                        
-                                       ast_verb(3, "Channel '%s' switched to T.38 FAX session '%d'.\n", chan->name, fax->id);
+                                       ast_verb(3, "Channel '%s' switched to T.38 FAX session '%u'.\n", chan->name, fax->id);
                                }
                        } else if ((frame->frametype == expected_frametype) &&
                                   (!memcmp(&frame->subclass, &expected_framesubclass, sizeof(frame->subclass)))) {
@@ -1618,7 +1618,7 @@ static int receivefax_exec(struct ast_channel *chan, const char *data)
                ast_string_field_set(details, error, "INVALID_ARGUMENTS");
                ast_string_field_set(details, resultstr, "maxrate is less than minrate");
                set_channel_variables(chan, details);
-               ast_log(LOG_ERROR, "maxrate %d is less than minrate %d\n", details->maxrate, details->minrate);
+               ast_log(LOG_ERROR, "maxrate %u is less than minrate %u\n", details->maxrate, details->minrate);
                ao2_ref(details, -1);
                return -1;
        }
@@ -1626,7 +1626,7 @@ static int receivefax_exec(struct ast_channel *chan, const char *data)
        if (check_modem_rate(details->modems, details->minrate)) {
                ast_atomic_fetchadd_int(&faxregistry.fax_failures, 1);
                ast_fax_modem_to_str(details->modems, modems, sizeof(modems));
-               ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'minrate' setting %d\n", modems, details->minrate);
+               ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'minrate' setting %u\n", modems, details->minrate);
                ast_string_field_set(details, error, "INVALID_ARGUMENTS");
                ast_string_field_set(details, resultstr, "incompatible 'modems' and 'minrate' settings");
                set_channel_variables(chan, details);
@@ -1637,7 +1637,7 @@ static int receivefax_exec(struct ast_channel *chan, const char *data)
        if (check_modem_rate(details->modems, details->maxrate)) {
                ast_atomic_fetchadd_int(&faxregistry.fax_failures, 1);
                ast_fax_modem_to_str(details->modems, modems, sizeof(modems));
-               ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'maxrate' setting %d\n", modems, details->maxrate);
+               ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'maxrate' setting %u\n", modems, details->maxrate);
                ast_string_field_set(details, error, "INVALID_ARGUMENTS");
                ast_string_field_set(details, resultstr, "incompatible 'modems' and 'maxrate' settings");
                set_channel_variables(chan, details);
@@ -2106,7 +2106,7 @@ static int sendfax_exec(struct ast_channel *chan, const char *data)
                ast_string_field_set(details, error, "INVALID_ARGUMENTS");
                ast_string_field_set(details, resultstr, "maxrate is less than minrate");
                set_channel_variables(chan, details);
-               ast_log(LOG_ERROR, "maxrate %d is less than minrate %d\n", details->maxrate, details->minrate);
+               ast_log(LOG_ERROR, "maxrate %u is less than minrate %u\n", details->maxrate, details->minrate);
                ao2_ref(details, -1);
                return -1;
        }
@@ -2114,7 +2114,7 @@ static int sendfax_exec(struct ast_channel *chan, const char *data)
        if (check_modem_rate(details->modems, details->minrate)) {
                ast_atomic_fetchadd_int(&faxregistry.fax_failures, 1);
                ast_fax_modem_to_str(details->modems, modems, sizeof(modems));
-               ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'minrate' setting %d\n", modems, details->minrate);
+               ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'minrate' setting %u\n", modems, details->minrate);
                ast_string_field_set(details, error, "INVALID_ARGUMENTS");
                ast_string_field_set(details, resultstr, "incompatible 'modems' and 'minrate' settings");
                set_channel_variables(chan, details);
@@ -2125,7 +2125,7 @@ static int sendfax_exec(struct ast_channel *chan, const char *data)
        if (check_modem_rate(details->modems, details->maxrate)) {
                ast_atomic_fetchadd_int(&faxregistry.fax_failures, 1);
                ast_fax_modem_to_str(details->modems, modems, sizeof(modems));
-               ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'maxrate' setting %d\n", modems, details->maxrate);
+               ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'maxrate' setting %u\n", modems, details->maxrate);
                ast_string_field_set(details, error, "INVALID_ARGUMENTS");
                ast_string_field_set(details, resultstr, "incompatible 'modems' and 'maxrate' settings");
                set_channel_variables(chan, details);
@@ -2370,7 +2370,7 @@ static char *fax_session_tab_complete(struct ast_cli_args *a)
        tklen = strlen(a->word);
        i = ao2_iterator_init(faxregistry.container, 0);
        while ((s = ao2_iterator_next(&i))) {
-               snprintf(tbuf, sizeof(tbuf), "%d", s->id);
+               snprintf(tbuf, sizeof(tbuf), "%u", s->id);
                if (!strncasecmp(a->word, tbuf, tklen) && ++wordnum > a->n) {
                        name = ast_strdup(tbuf);
                        ao2_ref(s, -1);
@@ -2473,7 +2473,7 @@ static char *cli_fax_show_capabilities(struct ast_cli_entry *e, int cmd, struct
                num_modules++;
        }
        AST_RWLIST_UNLOCK(&faxmodules);
-       ast_cli(a->fd, "%d registered modules\n\n", num_modules);
+       ast_cli(a->fd, "%u registered modules\n\n", num_modules);
 
        return CLI_SUCCESS;
 }
@@ -2501,8 +2501,8 @@ static char *cli_fax_show_settings(struct ast_cli_entry *e, int cmd, struct ast_
        ast_cli(a->fd, "FAX For Asterisk Settings:\n");
        ast_cli(a->fd, "\tECM: %s\n", options.ecm ? "Enabled" : "Disabled");
        ast_cli(a->fd, "\tStatus Events: %s\n",  options.statusevents ? "On" : "Off");
-       ast_cli(a->fd, "\tMinimum Bit Rate: %d\n", options.minrate);
-       ast_cli(a->fd, "\tMaximum Bit Rate: %d\n", options.maxrate);
+       ast_cli(a->fd, "\tMinimum Bit Rate: %u\n", options.minrate);
+       ast_cli(a->fd, "\tMaximum Bit Rate: %u\n", options.maxrate);
        ast_fax_modem_to_str(options.modems, modems, sizeof(modems));
        ast_cli(a->fd, "\tModem Modulations Allowed: %s\n", modems);
        ast_cli(a->fd, "\n\nFAX Technology Modules:\n\n");
@@ -2536,7 +2536,7 @@ static char *cli_fax_show_session(struct ast_cli_entry *e, int cmd, struct ast_c
                return CLI_SHOWUSAGE;
        }
 
-       if (sscanf(a->argv[3], "%d", &tmp.id) != 1) {
+       if (sscanf(a->argv[3], "%u", &tmp.id) != 1) {
                ast_log(LOG_ERROR, "invalid session id: '%s'\n", a->argv[3]);
                return RESULT_SUCCESS;
        }
@@ -2619,7 +2619,7 @@ static char *cli_fax_show_sessions(struct ast_cli_entry *e, int cmd, struct ast_
                        return CLI_FAILURE;
                }
 
-               ast_cli(a->fd, "%-20.20s %-10.10s %-10d %-5.5s %-10.10s %-15.15s %-30s\n",
+               ast_cli(a->fd, "%-20.20s %-10.10s %-10u %-5.5s %-10.10s %-15.15s %-30s\n",
                        s->channame, s->tech->type, s->id,
                        (s->details->caps & AST_FAX_TECH_AUDIO) ? "G.711" : "T.38",
                        (s->details->caps & AST_FAX_TECH_SEND) ? "send" : "receive",
@@ -2733,28 +2733,28 @@ static int set_config(int reload)
        }
 
        if (options.maxrate < options.minrate) {
-               ast_log(LOG_ERROR, "maxrate %d is less than minrate %d\n", options.maxrate, options.minrate);
+               ast_log(LOG_ERROR, "maxrate %u is less than minrate %u\n", options.maxrate, options.minrate);
                res = -1;
                goto end;
        }
 
        if (options.minrate == 2400 && (options.modems & AST_FAX_MODEM_V27) && !(options.modems & (AST_FAX_MODEM_V34))) {
                ast_fax_modem_to_str(options.modems, modems, sizeof(modems));
-               ast_log(LOG_WARNING, "'modems' setting '%s' is no longer accepted with 'minrate' setting %d\n", modems, options.minrate);
+               ast_log(LOG_WARNING, "'modems' setting '%s' is no longer accepted with 'minrate' setting %u\n", modems, options.minrate);
                ast_log(LOG_WARNING, "'minrate' has been reset to 4800, please update res_fax.conf.\n");
                options.minrate = 4800;
        }
 
        if (check_modem_rate(options.modems, options.minrate)) {
                ast_fax_modem_to_str(options.modems, modems, sizeof(modems));
-               ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'minrate' setting %d\n", modems, options.minrate);
+               ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'minrate' setting %u\n", modems, options.minrate);
                res = -1;
                goto end;
        }
 
        if (check_modem_rate(options.modems, options.maxrate)) {
                ast_fax_modem_to_str(options.modems, modems, sizeof(modems));
-               ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'maxrate' setting %d\n", modems, options.maxrate);
+               ast_log(LOG_ERROR, "'modems' setting '%s' is incompatible with 'maxrate' setting %u\n", modems, options.maxrate);
                res = -1;
                goto end;
        }
@@ -2804,11 +2804,11 @@ static int acf_faxopt_read(struct ast_channel *chan, const char *cmd, char *data
        } else if (!strcasecmp(data, "localstationid")) {
                ast_copy_string(buf, details->localstationid, len);
        } else if (!strcasecmp(data, "maxrate")) {
-               snprintf(buf, len, "%d", details->maxrate);
+               snprintf(buf, len, "%u", details->maxrate);
        } else if (!strcasecmp(data, "minrate")) {
-               snprintf(buf, len, "%d", details->minrate);
+               snprintf(buf, len, "%u", details->minrate);
        } else if (!strcasecmp(data, "pages")) {
-               snprintf(buf, len, "%d", details->pages_transferred);
+               snprintf(buf, len, "%u", details->pages_transferred);
        } else if (!strcasecmp(data, "rate")) {
                ast_copy_string(buf, details->transfer_rate, len);
        } else if (!strcasecmp(data, "remotestationid")) {
@@ -2816,7 +2816,7 @@ static int acf_faxopt_read(struct ast_channel *chan, const char *cmd, char *data
        } else if (!strcasecmp(data, "resolution")) {
                ast_copy_string(buf, details->resolution, len);
        } else if (!strcasecmp(data, "sessionid")) {
-               snprintf(buf, len, "%d", details->id);
+               snprintf(buf, len, "%u", details->id);
        } else if (!strcasecmp(data, "status")) {
                ast_copy_string(buf, details->result, len);
        } else if (!strcasecmp(data, "statusstr")) {
index b84eb8fcc80ae2f8ca76006c64011708aedef5e6..bc46fbcdd6f5f4cbbc36c8ef49448204324b62d4 100644 (file)
@@ -314,7 +314,7 @@ static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completi
        const char *c;
        t30_stats_t stats;
 
-       ast_debug(5, "FAX session '%d' entering phase E\n", s->id);
+       ast_debug(5, "FAX session '%u' entering phase E\n", s->id);
 
        p->isdone = 1;
 
@@ -331,7 +331,7 @@ static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completi
 
        ast_string_field_set(s->details, resultstr, t30_completion_code_to_str(completion_code));
 
-       ast_debug(5, "FAX session '%d' completed with result: %s (%s)\n", s->id, s->details->result, s->details->resultstr);
+       ast_debug(5, "FAX session '%u' completed with result: %s (%s)\n", s->id, s->details->result, s->details->resultstr);
 
        if ((c = t30_get_tx_ident(t30_state))) {
                ast_string_field_set(s->details, localstationid, c);
@@ -461,7 +461,7 @@ static void *spandsp_fax_new(struct ast_fax_session *s, struct ast_fax_tech_toke
        }
 
        if (!(p->timer = ast_timer_open())) {
-               ast_log(LOG_ERROR, "Channel '%s' FAX session '%d' failed to create timing source.\n", s->channame, s->id);
+               ast_log(LOG_ERROR, "Channel '%s' FAX session '%u' failed to create timing source.\n", s->channame, s->id);
                goto e_free;
        }
 
@@ -524,14 +524,14 @@ static struct ast_frame *spandsp_fax_read(struct ast_fax_session *s)
        struct ast_frame *f = &fax_frame;
 
        if (ast_timer_ack(p->timer, 1) < 0) {
-               ast_log(LOG_ERROR, "Failed to acknowledge timer for FAX session '%d'\n", s->id);
+               ast_log(LOG_ERROR, "Failed to acknowledge timer for FAX session '%u'\n", s->id);
                return NULL;
        }
 
        /* XXX do we need to lock here? */
        if (p->isdone) {
                s->state = AST_FAX_STATE_COMPLETE;
-               ast_debug(5, "FAX session '%d' is complete.\n", s->id);
+               ast_debug(5, "FAX session '%u' is complete.\n", s->id);
                return NULL;
        }
 
@@ -567,7 +567,7 @@ static int spandsp_fax_write(struct ast_fax_session *s, const struct ast_frame *
 
        /* XXX do we need to lock here? */
        if (s->state == AST_FAX_STATE_COMPLETE) {
-               ast_log(LOG_WARNING, "FAX session '%d' is in the '%s' state.\n", s->id, ast_fax_state_to_str(s->state));
+               ast_log(LOG_WARNING, "FAX session '%u' is in the '%s' state.\n", s->id, ast_fax_state_to_str(s->state));
                return -1;
        }
 
@@ -642,7 +642,7 @@ static int spandsp_fax_start(struct ast_fax_session *s)
 
        /* start the timer */
        if (ast_timer_set_rate(p->timer, SPANDSP_FAX_TIMER_RATE)) {
-               ast_log(LOG_ERROR, "FAX session '%d' error setting rate on timing source.\n", s->id);
+               ast_log(LOG_ERROR, "FAX session '%u' error setting rate on timing source.\n", s->id);
                return -1;
        }
 
@@ -694,7 +694,7 @@ static char *spandsp_fax_cli_show_session(struct ast_fax_session *s, int fd)
        t30_stats_t stats;
 
        ao2_lock(s);
-       ast_cli(fd, "%-22s : %d\n", "session", s->id);
+       ast_cli(fd, "%-22s : %u\n", "session", s->id);
        ast_cli(fd, "%-22s : %s\n", "operation", (s->details->caps & AST_FAX_TECH_RECEIVE) ? "Receive" : "Transmit");
        ast_cli(fd, "%-22s : %s\n", "state", ast_fax_state_to_str(s->state));
        if (s->state != AST_FAX_STATE_UNINITIALIZED) {
index bd3763ba59539b08221a4f8e66ebf13f86b6c85e..5ae60c1ce6dc339f484eccc0e47db085a502a017 100644 (file)
@@ -1765,7 +1765,7 @@ static int aji_act_hook(void *data, int type, iks *node)
                aji_handle_iq(client, node);
                break;
        default:
-               ast_debug(1, "JABBER: I don't know anything about paktype '%d'\n", pak->type);
+               ast_debug(1, "JABBER: I don't know anything about paktype '%u'\n", pak->type);
                break;
        }
 
@@ -2474,35 +2474,35 @@ static void aji_handle_presence(struct aji_client *client, ikspak *pak)
        }
        switch (pak->subtype) {
        case IKS_TYPE_AVAILABLE:
-               ast_debug(3, "JABBER: I am available ^_* %i\n", pak->subtype);
+               ast_debug(3, "JABBER: I am available ^_* %u\n", pak->subtype);
                break;
        case IKS_TYPE_UNAVAILABLE:
-               ast_debug(3, "JABBER: I am unavailable ^_* %i\n", pak->subtype);
+               ast_debug(3, "JABBER: I am unavailable ^_* %u\n", pak->subtype);
                break;
        default:
-               ast_debug(3, "JABBER: Ohh sexy and the wrong type: %i\n", pak->subtype);
+               ast_debug(3, "JABBER: Ohh sexy and the wrong type: %u\n", pak->subtype);
        }
        switch (pak->show) {
        case IKS_SHOW_UNAVAILABLE:
-               ast_debug(3, "JABBER: type: %i subtype %i\n", pak->subtype, pak->show);
+               ast_debug(3, "JABBER: type: %u subtype %u\n", pak->subtype, pak->show);
                break;
        case IKS_SHOW_AVAILABLE:
                ast_debug(3, "JABBER: type is available\n");
                break;
        case IKS_SHOW_CHAT:
-               ast_debug(3, "JABBER: type: %i subtype %i\n", pak->subtype, pak->show);
+               ast_debug(3, "JABBER: type: %u subtype %u\n", pak->subtype, pak->show);
                break;
        case IKS_SHOW_AWAY:
                ast_debug(3, "JABBER: type is away\n");
                break;
        case IKS_SHOW_XA:
-               ast_debug(3, "JABBER: type: %i subtype %i\n", pak->subtype, pak->show);
+               ast_debug(3, "JABBER: type: %u subtype %u\n", pak->subtype, pak->show);
                break;
        case IKS_SHOW_DND:
-               ast_debug(3, "JABBER: type: %i subtype %i\n", pak->subtype, pak->show);
+               ast_debug(3, "JABBER: type: %u subtype %u\n", pak->subtype, pak->show);
                break;
        default:
-               ast_debug(3, "JABBER: Kinky! how did that happen %i\n", pak->show);
+               ast_debug(3, "JABBER: Kinky! how did that happen %u\n", pak->show);
        }
 
        if (found) {
@@ -2513,7 +2513,7 @@ static void aji_handle_presence(struct aji_client *client, ikspak *pak)
                        found->priority, S_OR(found->description, ""));
        } else {
                manager_event(EVENT_FLAG_USER, "JabberStatus",
-                       "Account: %s\r\nJID: %s\r\nStatus: %d\r\n",
+                       "Account: %s\r\nJID: %s\r\nStatus: %u\r\n",
                        client->name, pak->from->partial, pak->show ? pak->show : IKS_SHOW_UNAVAILABLE);
        }
 }
@@ -2563,7 +2563,7 @@ static void aji_handle_subscribe(struct aji_client *client, ikspak *pak)
                }
        default:
                if (option_verbose > 4) {
-                       ast_verbose(VERBOSE_PREFIX_3 "JABBER: This is a subcription of type %i\n", pak->subtype);
+                       ast_verbose(VERBOSE_PREFIX_3 "JABBER: This is a subcription of type %u\n", pak->subtype);
                }
        }
 }
@@ -3189,9 +3189,9 @@ static void aji_mwi_cb(const struct ast_event *ast_event, void *data)
        client = ASTOBJ_REF((struct aji_client *) data);
        mailbox = ast_event_get_ie_str(ast_event, AST_EVENT_IE_MAILBOX);
        context = ast_event_get_ie_str(ast_event, AST_EVENT_IE_CONTEXT);
-       snprintf(oldmsgs, sizeof(oldmsgs), "%d",
+       snprintf(oldmsgs, sizeof(oldmsgs), "%u",
                ast_event_get_ie_uint(ast_event, AST_EVENT_IE_OLDMSGS));
-       snprintf(newmsgs, sizeof(newmsgs), "%d",
+       snprintf(newmsgs, sizeof(newmsgs), "%u",
                ast_event_get_ie_uint(ast_event, AST_EVENT_IE_NEWMSGS));
        aji_publish_mwi(client, mailbox, context, oldmsgs, newmsgs);
        ASTOBJ_UNREF(client, ast_aji_client_destroy);
@@ -3281,7 +3281,7 @@ static int aji_handle_pubsub_event(void *data, ikspak *pak)
        }
        if (!strcasecmp(iks_name(item_content), "state")) {
                if ((cachable_str = iks_find_attrib(item_content, "cachable"))) {
-                       sscanf(cachable_str, "%30d", &cachable);
+                       sscanf(cachable_str, "%30u", &cachable);
                }
                device_state = iks_find_cdata(item, "state");
                if (!(event = ast_event_new(AST_EVENT_DEVICE_STATE_CHANGE,
index 711a54b9156b0b54d13ee3f6a76725b560043999..8dd7e6a912149c144e26797c14dbb721794c475f 100644 (file)
@@ -326,9 +326,9 @@ int AST_OPTIONAL_API_NAME(ast_monitor_start)(struct ast_channel *chan, const cha
                        }
                } else {
                        ast_mutex_lock(&monitorlock);
-                       snprintf(monitor->read_filename, FILENAME_MAX, "%s/audio-in-%ld",
+                       snprintf(monitor->read_filename, FILENAME_MAX, "%s/audio-in-%lu",
                                                ast_config_AST_MONITOR_DIR, seq);
-                       snprintf(monitor->write_filename, FILENAME_MAX, "%s/audio-out-%ld",
+                       snprintf(monitor->write_filename, FILENAME_MAX, "%s/audio-out-%lu",
                                                ast_config_AST_MONITOR_DIR, seq);
                        seq++;
                        ast_mutex_unlock(&monitorlock);
index 6be9e1a85378ce22fdaacaf8dd55c302c33a9ac3..fc6a278f5ba865fadf8c6b52898cb5bed0bc6f7b 100644 (file)
@@ -227,7 +227,7 @@ static int reload(void);
 #define mohclass_ref(class,string)   (ao2_t_ref((class), +1, (string)), class)
 
 #ifndef REF_DEBUG
-#define mohclass_unref(class,string) (ao2_t_ref((class), -1, (string)), (struct mohclass *) NULL)
+#define mohclass_unref(class,string) ({ ao2_t_ref((class), -1, (string)); (struct mohclass *) NULL; })
 #else
 #define mohclass_unref(class,string) _mohclass_unref(class, string, __FILE__,__LINE__,__PRETTY_FUNCTION__)
 static struct mohclass *_mohclass_unref(struct mohclass *class, const char *tag, const char *file, int line, const char *funcname)
index 6dbc9fb01a1a5c8c92218060b923ba78742caf92..012f0bb79533bf509b22cc2831e0597f97460213 100644 (file)
@@ -987,7 +987,7 @@ static char *handle_cli_odbc_show(struct ast_cli_entry *e, int cmd, struct ast_c
                        if (class->haspool) {
                                struct ao2_iterator aoi2 = ao2_iterator_init(class->obj_container, 0);
 
-                               ast_cli(a->fd, "  Pooled: Yes\n  Limit:  %d\n  Connections in use: %d\n", class->limit, class->count);
+                               ast_cli(a->fd, "  Pooled: Yes\n  Limit:  %u\n  Connections in use: %d\n", class->limit, class->count);
 
                                while ((current = ao2_iterator_next(&aoi2))) {
                                        ast_mutex_lock(&current->lock);
index 80726f08ba67bb458f3513e15696314d9f7cc692..747281952bd12acbaf1c567b4ea4645ced9d80f1 100644 (file)
@@ -397,7 +397,7 @@ static int cops_sendmsg (int sfd, struct copsmsg * sendmsg)
                return -1;
        }
 
-       ast_debug(3, "COPS: sending opcode: %i len: %i\n", sendmsg->opcode, sendmsg->length);
+       ast_debug(3, "COPS: sending opcode: %i len: %u\n", sendmsg->opcode, sendmsg->length);
        if (sendmsg->length < COPS_HEADER_SIZE) {
                ast_log(LOG_WARNING, "COPS: invalid msg size!!!\n");
                return -1;
@@ -418,7 +418,7 @@ static int cops_sendmsg (int sfd, struct copsmsg * sendmsg)
                while(pobject != NULL) {
                        ast_debug(3, "COPS: Sending Object : cnum: %i ctype %i len: %i\n", pobject->cnum, pobject->ctype, pobject->length);
                        if (sendmsg->length < bufpos + pobject->length) {
-                               ast_log(LOG_WARNING, "COPS: Invalid msg size len: %i objectlen: %i\n", sendmsg->length, pobject->length);
+                               ast_log(LOG_WARNING, "COPS: Invalid msg size len: %u objectlen: %i\n", sendmsg->length, pobject->length);
                                free(buf);
                                return -1;
                        }
@@ -426,7 +426,7 @@ static int cops_sendmsg (int sfd, struct copsmsg * sendmsg)
                        *(buf + bufpos + 2) = pobject->cnum;
                        *(buf + bufpos + 3) = pobject->ctype;
                        if (sendmsg->length < pobject->length + bufpos) {
-                               ast_log(LOG_WARNING, "COPS: Error sum of object len more the msg len %i < %i\n", sendmsg->length, pobject->length + bufpos);
+                               ast_log(LOG_WARNING, "COPS: Error sum of object len more the msg len %u < %i\n", sendmsg->length, pobject->length + bufpos);
                                free(buf);
                                return -1;
                        }
@@ -726,7 +726,7 @@ static void *do_pktccops(void *data)
                AST_LIST_TRAVERSE(&cmts_list, cmts, list) {
                        if (last_exec != time(NULL)) {
                                if (cmts->state == 2 && cmts->katimer + cmts->keepalive < time(NULL)) {
-                                       ast_log(LOG_WARNING, "KA timer (%is) expired cmts: %s\n",  cmts->keepalive, cmts->name);
+                                       ast_log(LOG_WARNING, "KA timer (%us) expired cmts: %s\n",  cmts->keepalive, cmts->name);
                                        cmts->state = 0;
                                        cmts->katimer = -1;
                                        close(cmts->sfd);
@@ -799,15 +799,16 @@ static void *do_pktccops(void *data)
                                if ((idx = ast_poll_fd_index(pfds, nfds, cmts->sfd)) > -1 && (pfds[idx].revents & POLLIN)) {
                                        len = cops_getmsg(cmts->sfd, recmsg);
                                        if (len > 0) {
-                                               ast_debug(3, "COPS: got from %s:\n Header: versflag=0x%.2x opcode=%i clienttype=0x%.4x msglength=%i\n",
-                                                       cmts->name, recmsg->verflag, recmsg->opcode, recmsg->clienttype, recmsg->length);
+                                               ast_debug(3, "COPS: got from %s:\n Header: versflag=0x%.2x opcode=%i clienttype=0x%.4x msglength=%u\n",
+                                                       cmts->name, (unsigned)recmsg->verflag,
+                                                       recmsg->opcode, (unsigned)recmsg->clienttype, recmsg->length);
                                                if (recmsg->object != NULL) {
                                                        pobject = recmsg->object;
                                                        while (pobject != NULL) {
                                                                ast_debug(3, " OBJECT: length=%i cnum=%i ctype=%i\n", pobject->length, pobject->cnum, pobject->ctype);
                                                                if (recmsg->opcode == 1 && pobject->cnum == 1 && pobject->ctype == 1 ) {
                                                                        cmts->handle = ntohl(*((uint32_t *) pobject->contents));
-                                                                       ast_debug(3, "    REQ client handle: %i\n", cmts->handle);
+                                                                       ast_debug(3, "    REQ client handle: %u\n", cmts->handle);
                                                                        cmts->state = 2;
                                                                        cmts->katimer = time(NULL);
                                                                } else if (pobject->cnum == 9 && pobject->ctype == 1) {
@@ -823,7 +824,7 @@ static void *do_pktccops(void *data)
                                                                        while (sobjp < (pobject->contents + pobject->length - 4)) {
                                                                                sobjlen = ntohs(*((uint16_t *) sobjp));
                                                                                snst = ntohs(*((uint16_t *) (sobjp + 2)));
-                                                                               ast_debug(3, "   S-Num S-type: 0x%.4x len: %i\n", snst, sobjlen);
+                                                                               ast_debug(3, "   S-Num S-type: 0x%.4x len: %i\n", (unsigned)snst, sobjlen);
                                                                                if (snst == 0x0101 ) {
                                                                                        recvtrid = ntohs(*((uint16_t *) (sobjp + 4)));
                                                                                        scommand = ntohs(*((uint16_t *) (sobjp + 6)));                                  
@@ -843,7 +844,7 @@ static void *do_pktccops(void *data)
                                                                                } else if (snst == 0x0d01) {
                                                                                        reason = ntohs(*((uint16_t *) (sobjp + 4)));
                                                                                        subreason = ntohs(*((uint16_t *) (sobjp + 6)));
-                                                                                       ast_debug(3, "      Reason: %u Subreason: %u\n", reason, subreason);
+                                                                                       ast_debug(3, "      Reason: %d Subreason: %d\n", reason, subreason);
                                                                                }
                                                                                sobjp += sobjlen;
                                                                                if (!sobjlen)
index 6c7f88c60b6db35be0383517d52ae9a2a7292ad3..df97202d457546d9c5566905450588fd3f990f43 100644 (file)
@@ -717,7 +717,7 @@ static int ast_rtp_dtmf_begin(struct ast_rtp_instance *instance, char digit)
                                strerror(errno));
                }
                if (rtp_debug_test_addr(&remote_address)) {
-                       ast_verbose("Sent RTP DTMF packet to %s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+                       ast_verbose("Sent RTP DTMF packet to %s (type %-2.2d, seq %-6.6d, ts %-6.6u, len %-6.6d)\n",
                                    ast_sockaddr_stringify(&remote_address),
                                    payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
                }
@@ -764,7 +764,7 @@ static int ast_rtp_dtmf_continuation(struct ast_rtp_instance *instance)
        }
 
        if (rtp_debug_test_addr(&remote_address)) {
-               ast_verbose("Sent RTP DTMF packet to %s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+               ast_verbose("Sent RTP DTMF packet to %s (type %-2.2d, seq %-6.6d, ts %-6.6u, len %-6.6d)\n",
                            ast_sockaddr_stringify(&remote_address),
                            rtp->send_payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
        }
@@ -812,7 +812,7 @@ static int ast_rtp_dtmf_end_with_duration(struct ast_rtp_instance *instance, cha
        rtp->dtmfmute = ast_tvadd(ast_tvnow(), ast_tv(0, 500000));
 
        if (duration > 0 && (measured_samples = duration * rtp_get_rate(rtp->f.subclass.codec) / 1000) > rtp->send_duration) {
-               ast_debug(2, "Adjusting final end duration from %u to %u\n", rtp->send_duration, measured_samples);
+               ast_debug(2, "Adjusting final end duration from %d to %u\n", rtp->send_duration, measured_samples);
                rtp->send_duration = measured_samples;
        }
 
@@ -834,7 +834,7 @@ static int ast_rtp_dtmf_end_with_duration(struct ast_rtp_instance *instance, cha
                                strerror(errno));
                }
                if (rtp_debug_test_addr(&remote_address)) {
-                       ast_verbose("Sent RTP DTMF packet to %s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+                       ast_verbose("Sent RTP DTMF packet to %s (type %-2.2d, seq %-6.6d, ts %-6.6u, len %-6.6d)\n",
                                    ast_sockaddr_stringify(&remote_address),
                                    rtp->send_payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
                }
@@ -1102,7 +1102,7 @@ static int ast_rtcp_write_sr(struct ast_rtp_instance *instance)
                ast_verbose("  Sent packets: %u\n", rtp->txcount);
                ast_verbose("  Sent octets: %u\n", rtp->txoctetcount);
                ast_verbose("  Report block:\n");
-               ast_verbose("  Fraction lost: %u\n", fraction);
+               ast_verbose("  Fraction lost: %d\n", fraction);
                ast_verbose("  Cumulative loss: %u\n", lost);
                ast_verbose("  IA jitter: %.4f\n", rtp->rxjitter);
                ast_verbose("  Their last SR: %u\n", rtp->rtcp->themrxlsr);
@@ -1115,7 +1115,7 @@ static int ast_rtcp_write_sr(struct ast_rtp_instance *instance)
                                            "SentPackets: %u\r\n"
                                            "SentOctets: %u\r\n"
                                            "ReportBlock:\r\n"
-                                           "FractionLost: %u\r\n"
+                                           "FractionLost: %d\r\n"
                                            "CumulativeLoss: %u\r\n"
                                            "IAJitter: %.4f\r\n"
                                            "TheirLastSR: %u\r\n"
@@ -1192,7 +1192,7 @@ static int ast_rtp_raw_write(struct ast_rtp_instance *instance, struct ast_frame
                        if (abs(rtp->lastts - pred) < MAX_TIMESTAMP_SKEW) {
                                rtp->lastts = pred;
                        } else {
-                               ast_debug(3, "Difference is %d, ms is %d\n", abs(rtp->lastts - pred), ms);
+                               ast_debug(3, "Difference is %d, ms is %u\n", abs(rtp->lastts - pred), ms);
                                mark = 1;
                        }
                }
@@ -1207,7 +1207,7 @@ static int ast_rtp_raw_write(struct ast_rtp_instance *instance, struct ast_frame
                                rtp->lastts = pred;
                                rtp->lastovidtimestamp += frame->samples;
                        } else {
-                               ast_debug(3, "Difference is %d, ms is %d (%d), pred/ts/samples %d/%d/%d\n", abs(rtp->lastts - pred), ms, ms * 90, rtp->lastts, pred, frame->samples);
+                               ast_debug(3, "Difference is %d, ms is %u (%u), pred/ts/samples %u/%d/%d\n", abs(rtp->lastts - pred), ms, ms * 90, rtp->lastts, pred, frame->samples);
                                rtp->lastovidtimestamp = rtp->lastts;
                        }
                }
@@ -1221,7 +1221,7 @@ static int ast_rtp_raw_write(struct ast_rtp_instance *instance, struct ast_frame
                                rtp->lastts = pred;
                                rtp->lastotexttimestamp += frame->samples;
                        } else {
-                               ast_debug(3, "Difference is %d, ms is %d, pred/ts/samples %d/%d/%d\n", abs(rtp->lastts - pred), ms, rtp->lastts, pred, frame->samples);
+                               ast_debug(3, "Difference is %d, ms is %u, pred/ts/samples %u/%d/%d\n", abs(rtp->lastts - pred), ms, rtp->lastts, pred, frame->samples);
                                rtp->lastotexttimestamp = rtp->lastts;
                        }
                }
@@ -1282,7 +1282,7 @@ static int ast_rtp_raw_write(struct ast_rtp_instance *instance, struct ast_frame
                }
 
                if (rtp_debug_test_addr(&remote_address)) {
-                       ast_verbose("Sent RTP packet to      %s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+                       ast_verbose("Sent RTP packet to      %s (type %-2.2d, seq %-6.6d, ts %-6.6u, len %-6.6d)\n",
                                    ast_sockaddr_stringify(&remote_address),
                                    codec, rtp->seqno, rtp->lastts, res - hdrlen);
                }
@@ -1553,7 +1553,7 @@ static void process_dtmf_rfc2833(struct ast_rtp_instance *instance, unsigned cha
        samples &= 0xFFFF;
 
        if (rtp_debug_test_addr(&remote_address)) {
-               ast_verbose("Got  RTP RFC2833 from   %s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d) \n",
+               ast_verbose("Got  RTP RFC2833 from   %s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6d, mark %d, event %08x, end %d, duration %-5.5u) \n",
                            ast_sockaddr_stringify(&remote_address),
                            payloadtype, seqno, timestamp, len, (mark?1:0), event, ((event_end & 0x80)?1:0), samples);
        }
@@ -1613,7 +1613,7 @@ static void process_dtmf_rfc2833(struct ast_rtp_instance *instance, unsigned cha
                                rtp->dtmf_duration = rtp->dtmf_timeout = 0;
                                AST_LIST_INSERT_TAIL(frames, f, frame_list);
                        } else if (rtpdebug) {
-                               ast_debug(1, "Dropping re-transmitted, duplicate, or out of order DTMF END frame (seqno: %d, ts %d, digit %c)\n",
+                               ast_debug(1, "Dropping re-transmitted, duplicate, or out of order DTMF END frame (seqno: %u, ts %u, digit %c)\n",
                                        seqno, timestamp, resp);
                        }
                } else {
@@ -1630,7 +1630,7 @@ static void process_dtmf_rfc2833(struct ast_rtp_instance *instance, unsigned cha
                                 * this.
                                 */
                                if (rtpdebug) {
-                                       ast_debug(1, "Dropping out of order DTMF frame (seqno %d, ts %d, digit %c)\n",
+                                       ast_debug(1, "Dropping out of order DTMF frame (seqno %u, ts %u, digit %c)\n",
                                                seqno, timestamp, resp);
                                }
                                return;
@@ -1715,7 +1715,7 @@ static struct ast_frame *process_dtmf_cisco(struct ast_rtp_instance *instance, u
        event = data[3] & 0x1f;
 
        if (option_debug > 2 || rtpdebug)
-               ast_debug(0, "Cisco DTMF Digit: %02x (len=%d, seq=%d, flags=%02x, power=%d, history count=%d)\n", event, len, seq, flags, power, (len - 4) / 2);
+               ast_debug(0, "Cisco DTMF Digit: %02x (len=%d, seq=%d, flags=%02x, power=%u, history count=%d)\n", event, len, seq, flags, power, (len - 4) / 2);
        if (event < 10) {
                resp = '0' + event;
        } else if (event < 11) {
@@ -1914,8 +1914,8 @@ static struct ast_frame *ast_rtcp_read(struct ast_rtp_instance *instance)
                                        rtp->rtcp->rtt_count++;
                                } else if (rtcp_debug_test_addr(&addr)) {
                                        ast_verbose("Internal RTCP NTP clock skew detected: "
-                                                          "lsr=%u, now=%u, dlsr=%u (%d:%03dms), "
-                                                   "diff=%d\n",
+                                                          "lsr=%u, now=%u, dlsr=%u (%u:%03ums), "
+                                                   "diff=%u\n",
                                                    lsr, comp, dlsr, dlsr / 65536,
                                                    (dlsr % 65536) * 1000 / 65536,
                                                    dlsr - (comp - lsr));
@@ -1963,7 +1963,7 @@ static struct ast_frame *ast_rtcp_read(struct ast_rtp_instance *instance)
 
                        if (rtcp_debug_test_addr(&addr)) {
                                ast_verbose("  Fraction lost: %ld\n", (((long) ntohl(rtcpheader[i + 1]) & 0xff000000) >> 24));
-                               ast_verbose("  Packets lost so far: %d\n", rtp->rtcp->reported_lost);
+                               ast_verbose("  Packets lost so far: %u\n", rtp->rtcp->reported_lost);
                                ast_verbose("  Highest sequence number: %ld\n", (long) (ntohl(rtcpheader[i + 2]) & 0xffff));
                                ast_verbose("  Sequence number cycles: %ld\n", (long) (ntohl(rtcpheader[i + 2])) >> 16);
                                ast_verbose("  Interarrival jitter: %u\n", rtp->rtcp->reported_jitter);
@@ -1978,7 +1978,7 @@ static struct ast_frame *ast_rtcp_read(struct ast_rtp_instance *instance)
                                                                    "ReceptionReports: %d\r\n"
                                                                    "SenderSSRC: %u\r\n"
                                                                    "FractionLost: %ld\r\n"
-                                                                   "PacketsLost: %d\r\n"
+                                                                   "PacketsLost: %u\r\n"
                                                                    "HighestSequence: %ld\r\n"
                                                                    "SequenceNumberCycles: %ld\r\n"
                                                                    "IAJitter: %u\r\n"
@@ -2003,7 +2003,7 @@ static struct ast_frame *ast_rtcp_read(struct ast_rtp_instance *instance)
                                                                    "ReceptionReports: %d\r\n"
                                                                    "SenderSSRC: %u\r\n"
                                                                    "FractionLost: %ld\r\n"
-                                                                   "PacketsLost: %d\r\n"
+                                                                   "PacketsLost: %u\r\n"
                                                                    "HighestSequence: %ld\r\n"
                                                                    "SequenceNumberCycles: %ld\r\n"
                                                                    "IAJitter: %u\r\n"
@@ -2124,7 +2124,7 @@ static int bridge_p2p_rtp_write(struct ast_rtp_instance *instance, unsigned int
                }
                return 0;
        } else if (rtp_debug_test_addr(&remote_address)) {
-               ast_verbose("Sent RTP P2P packet to %s (type %-2.2d, len %-6.6u)\n",
+               ast_verbose("Sent RTP P2P packet to %s (type %-2.2d, len %-6.6d)\n",
                            ast_sockaddr_stringify(&remote_address),
                            bridged_payload, len - hdrlen);
        }
@@ -2317,7 +2317,7 @@ static struct ast_frame *ast_rtp_read(struct ast_rtp_instance *instance, int rtc
                hdrlen += (ntohl(rtpheader[hdrlen/4]) & 0xffff) << 2;
                hdrlen += 4;
                if (option_debug) {
-                       int profile;
+                       unsigned int profile;
                        profile = (ntohl(rtpheader[3]) & 0xffff0000) >> 16;
                        if (profile == 0x505a)
                                ast_debug(1, "Found Zfone extension in RTP stream - zrtp - not supported.\n");
@@ -2358,7 +2358,7 @@ static struct ast_frame *ast_rtp_read(struct ast_rtp_instance *instance, int rtc
        }
 
        if (rtp_debug_test_addr(&addr)) {
-               ast_verbose("Got  RTP packet from    %s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+               ast_verbose("Got  RTP packet from    %s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6d)\n",
                            ast_sockaddr_stringify(&addr),
                            payloadtype, seqno, timestamp,res - hdrlen);
        }
@@ -2844,7 +2844,7 @@ static int ast_rtp_sendcng(struct ast_rtp_instance *instance, int level)
        if (res < 0) {
                ast_log(LOG_ERROR, "RTP Comfort Noise Transmission error to %s: %s\n", ast_sockaddr_stringify(&remote_address), strerror(errno));
        } else if (rtp_debug_test_addr(&remote_address)) {
-               ast_verbose("Sent Comfort Noise RTP packet to %s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+               ast_verbose("Sent Comfort Noise RTP packet to %s (type %-2.2d, seq %-6.6d, ts %-6.6u, len %-6.6d)\n",
                                ast_sockaddr_stringify(&remote_address),
                                AST_RTP_CN, rtp->seqno, rtp->lastdigitts, res - hdrlen);
        }
index 41241d0ed9b71a05670f62f9e17ed878345d7289..48c69a3e57209c448019125a482f7de0907ce4ff 100644 (file)
@@ -270,7 +270,7 @@ static int policy_set_suite(crypto_policy_t *p, enum ast_srtp_suite suite)
                return 0;
 
        default:
-               ast_log(LOG_ERROR, "Invalid crypto suite: %d\n", suite);
+               ast_log(LOG_ERROR, "Invalid crypto suite: %u\n", suite);
                return -1;
        }
 }
@@ -495,18 +495,18 @@ static int ast_srtp_add_stream(struct ast_srtp *srtp, struct ast_srtp_policy *po
                        return -1;
                } else {
                        if (srtp_remove_stream(srtp->session, match->sp.ssrc.value) != err_status_ok) {
-                               ast_log(AST_LOG_WARNING, "Failed to remove SRTP stream for SSRC %d\n", match->sp.ssrc.value);
+                               ast_log(AST_LOG_WARNING, "Failed to remove SRTP stream for SSRC %u\n", match->sp.ssrc.value);
                        }
                        ao2_t_unlink(srtp->policies, match, "Remove existing match policy");
                        ao2_t_ref(match, -1, "Unreffing already existing policy");
                }
        }
 
-       ast_debug(3, "Adding new policy for %s %d\n",
+       ast_debug(3, "Adding new policy for %s %u\n",
                policy->sp.ssrc.type == ssrc_specific ? "SSRC" : "type",
                policy->sp.ssrc.type == ssrc_specific ? policy->sp.ssrc.value : policy->sp.ssrc.type);
        if (srtp_add_stream(srtp->session, &policy->sp) != err_status_ok) {
-               ast_log(AST_LOG_WARNING, "Failed to add SRTP stream for %s %d\n",
+               ast_log(AST_LOG_WARNING, "Failed to add SRTP stream for %s %u\n",
                        policy->sp.ssrc.type == ssrc_specific ? "SSRC" : "type",
                        policy->sp.ssrc.type == ssrc_specific ? policy->sp.ssrc.value : policy->sp.ssrc.type);
                return -1;
@@ -534,7 +534,7 @@ static int ast_srtp_change_source(struct ast_srtp *srtp, unsigned int from_ssrc,
                if (ast_srtp_add_stream(srtp, match)) {
                        ast_log(LOG_WARNING, "Couldn't add stream\n");
                } else if ((status = srtp_remove_stream(srtp->session, from_ssrc))) {
-                       ast_debug(3, "Couldn't remove stream (%d)\n", status);
+                       ast_debug(3, "Couldn't remove stream (%u)\n", status);
                }
                ao2_t_ref(match, -1, "Unreffing found policy in change_source");
        }
index 6298253b774695d583c75c975ff112e20468816e..5a67f4d8612ddb2e661a71d0740a1a29873aae3c 100644 (file)
@@ -79,11 +79,9 @@ static void dahdi_timer_close(int handle)
 
 static int dahdi_timer_set_rate(int handle, unsigned int rate)
 {
-       int samples;
-
        /* DAHDI timers are configured using a number of samples,
         * based on an 8 kHz sample rate. */
-       samples = (unsigned int) roundf((8000.0 / ((float) rate)));
+       unsigned int samples = roundf((8000.0 / ((float) rate)));
 
        if (ioctl(handle, DAHDI_TIMERCONFIG, &samples)) {
                ast_log(LOG_ERROR, "Failed to configure DAHDI timing fd for %u sample timer ticks\n",