]> 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:39:22 +0000 (22:39 +0000)
committerKinsey Moore <kmoore@digium.com>
Fri, 9 May 2014 22:39:22 +0000 (22:39 +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.
........

Merged revisions 413586 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 413587 from http://svn.asterisk.org/svn/asterisk/branches/11

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

130 files changed:
apps/app_adsiprog.c
apps/app_confbridge.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_verbose.c
apps/app_voicemail.c
apps/confbridge/conf_config_parser.c
bridges/bridge_softmix.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_mgcp.c
channels/chan_motif.c
channels/chan_phone.c
channels/chan_sip.c
channels/chan_skinny.c
channels/chan_unistim.c
channels/iax2/firmware.c
channels/iax2/parser.c
channels/pjsip/dialplan_functions.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_channel.c
funcs/func_env.c
funcs/func_frame_trace.c
funcs/func_hangupcause.c
funcs/func_iconv.c
funcs/func_srv.c
funcs/func_sysinfo.c
include/asterisk/astobj.h
main/abstract_jb.c
main/acl.c
main/adsi.c
main/aoc.c
main/app.c
main/asterisk.c
main/audiohook.c
main/bridge_channel.c
main/bucket.c
main/callerid.c
main/ccss.c
main/cdr.c
main/channel.c
main/cli.c
main/config.c
main/config_options.c
main/core_unreal.c
main/data.c
main/devicestate.c
main/dsp.c
main/enum.c
main/event.c
main/file.c
main/format.c
main/frame.c
main/io.c
main/loader.c
main/logger.c
main/manager.c
main/manager_bridges.c
main/manager_channels.c
main/netsock.c
main/parking.c
main/pbx.c
main/rtp_engine.c
main/sched.c
main/security_events.c
main/slinfactory.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_ari_model.c
res/res_calendar.c
res/res_calendar_caldav.c
res/res_calendar_ews.c
res/res_calendar_icalendar.c
res/res_config_odbc.c
res/res_corosync.c
res/res_crypto.c
res/res_fax.c
res/res_fax_spandsp.c
res/res_format_attr_celt.c
res/res_format_attr_h263.c
res/res_format_attr_h264.c
res/res_format_attr_opus.c
res/res_format_attr_silk.c
res/res_http_websocket.c
res/res_jabber.c
res/res_monitor.c
res/res_musiconhold.c
res/res_odbc.c
res/res_pjsip/location.c
res/res_pjsip/pjsip_configuration.c
res/res_pjsip_outbound_registration.c
res/res_pjsip_pubsub.c
res/res_pjsip_registrar.c
res/res_pjsip_t38.c
res/res_pktccops.c
res/res_rtp_asterisk.c
res/res_sorcery_config.c
res/res_srtp.c
res/res_stasis_playback.c
res/res_stasis_recording.c
res/res_stasis_snoop.c
res/res_stun_monitor.c
res/res_timing_dahdi.c
res/res_xmpp.c

index 3654f4d6df4d9cacfd4ccbfc3a614694768b25f7..ac803248f4699c57c572c2e1a71aef071d20b08a 100644 (file)
@@ -211,7 +211,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 8db65ef6e852eab1759851953437860d9fbcd6a3..79d9fb542092190e49138ca8b4b71e47c46785f6 100644 (file)
@@ -2336,7 +2336,7 @@ static char *handle_cli_confbridge_list(struct ast_cli_entry *e, int cmd, struct
                ast_cli(a->fd, "================================ ====== ====== ========\n");
                iter = ao2_iterator_init(conference_bridges, 0);
                while ((conference = ao2_iterator_next(&iter))) {
-                       ast_cli(a->fd, "%-32s %6i %6i %s\n", conference->name, conference->activeusers + conference->waitingusers, conference->markedusers, (conference->locked ? "locked" : "unlocked"));
+                       ast_cli(a->fd, "%-32s %6u %6u %s\n", conference->name, conference->activeusers + conference->waitingusers, conference->markedusers, (conference->locked ? "locked" : "unlocked"));
                        ao2_ref(conference, -1);
                }
                ao2_iterator_destroy(&iter);
@@ -2792,8 +2792,8 @@ static int action_confbridgelistrooms(struct mansession *s, const struct message
                "Event: ConfbridgeListRooms\r\n"
                "%s"
                "Conference: %s\r\n"
-               "Parties: %d\r\n"
-               "Marked: %d\r\n"
+               "Parties: %u\r\n"
+               "Marked: %u\r\n"
                "Locked: %s\r\n"
                "\r\n",
                id_text,
index 9ad76b025e5e353199cba04c0cc491bf9655602a..9a3dff9be788aa84f49854849c92a4f3c596111a 100644 (file)
@@ -1487,7 +1487,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;
@@ -1592,7 +1592,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 bbe00e907dce02259cd3f5148dd2eebded906bfc..5c5be18afb0b440be8235b2d0f86fbdd38208341 100644 (file)
@@ -105,7 +105,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"
@@ -115,8 +115,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"
                "BridgeID=           %s\n"
index ffea6e8bf84871af0296f99a427f83062ea376b5..3ccacb195b9aaf2bcf1e2e4e6b7874c3bcc17742 100644 (file)
@@ -424,7 +424,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 5cdeca1133d79e5d3d96b047186ebebb3a6cd35d..8192b761944a110a55d157ca6e244cf21172ac11 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], ast_channel_name(chan));
+                       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], ast_channel_name(chan));
                }
                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 cdcf8b9331340b3a924ba630217c347449469de9..d05ead0666d6f65b7c38d317c8ef4f7e0ef26cd6 100644 (file)
@@ -1406,7 +1406,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);
@@ -1457,7 +1457,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 4dceec1dee9e90240c8b17b0d805fb34b3835728..5cb0ae81b2a8c2bb206bff5ff156dec5f25418bd 100644 (file)
@@ -2355,12 +2355,12 @@ static void device_state_cb(void *unused, struct stasis_subscription *sub, struc
        ao2_iterator_destroy(&qiter);
 
        if (found) {
-               ast_debug(1, "Device '%s' changed to state '%d' (%s)\n",
+               ast_debug(1, "Device '%s' changed to state '%u' (%s)\n",
                        dev_state->device,
                        dev_state->state,
                        ast_devstate2str(dev_state->state));
        } else {
-               ast_debug(3, "Device '%s' changed to state '%d' (%s) but we don't care because they're not a member of any queue.\n",
+               ast_debug(3, "Device '%s' changed to state '%u' (%s) but we don't care because they're not a member of any queue.\n",
                        dev_state->device,
                        dev_state->state,
                        ast_devstate2str(dev_state->state));
@@ -6612,7 +6612,7 @@ static int try_calling(struct queue_ent *qe, struct ast_flags opts, char **opt_a
                                        ast_monitor_start(which, qe->parent->monfmt, ast_channel_uniqueid(qe->chan), 1, X_REC_IN | X_REC_OUT);
                                } else {
                                        /* Last ditch effort -- no channel, 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)) {
index 12fede073a94a931ab6da0451ac30ef743fe2e1d..b7d2478188edcc2f788120a80aeba0fe38465dc0 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 ba3b97cd1820e857bf22c998de3db0a17f389ae9..2f89b35597b4ae347bb42fb03c65e6b2fed122c6 100644 (file)
@@ -641,7 +641,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 8d285b02f707285efa8bf247832518261352b8bc..c6fc8d17b997973edf75c96bf15f33675c254167 100644 (file)
@@ -78,7 +78,7 @@ static char *app_log = "Log";
 
 static int verbose_exec(struct ast_channel *chan, const char *data)
 {
-       int vsize;
+       unsigned int vsize;
        char *parse;
        AST_DECLARE_APP_ARGS(args,
                AST_APP_ARG(level);
index 14224585bc05263be3e7d5f07bff61d64a4ce7ef..e6a7384a2b2ce9224aef135ad8af5cab63d90162 100644 (file)
@@ -5071,7 +5071,7 @@ static void make_email_file(FILE *p,
                }
        }
 
-       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 */
@@ -5110,7 +5110,7 @@ static void make_email_file(FILE *p,
        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);
@@ -5301,7 +5301,7 @@ static int sendmail(char *srcemail,
 
        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) {
@@ -6033,7 +6033,7 @@ static void generate_msg_id(char *dst)
         * called each time a new msg_id is generated. This should achieve uniqueness,
         * but only in single system solutions.
         */
-       int unique_counter = ast_atomic_fetchadd_int(&msg_id_incrementor, +1);
+       unsigned int unique_counter = ast_atomic_fetchadd_int(&msg_id_incrementor, +1);
        snprintf(dst, MSG_ID_LEN, "%ld-%08x", (long) time(NULL), unique_counter);
 }
 
@@ -12997,7 +12997,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 48cf538dd5c08914a00921289a49048716fc3185..c4e57ae5530edad8de5c664ea4829bf0ef1c4197 100644 (file)
@@ -1057,7 +1057,7 @@ static int add_action_to_menu_entry(struct conf_menu_entry *menu_entry, enum con
                        }
                        menu_action->data.dialplan_args.priority = 1; /* 1 by default */
                        if (!ast_strlen_zero(args.priority) &&
-                               (sscanf(args.priority, "%30u", &menu_action->data.dialplan_args.priority) != 1)) {
+                               (sscanf(args.priority, "%30d", &menu_action->data.dialplan_args.priority) != 1)) {
                                /* invalid priority */
                                ast_free(menu_action);
                                return -1;
@@ -1324,9 +1324,9 @@ static char *handle_cli_confbridge_show_user_profile(struct ast_cli_entry *e, in
        ast_cli(a->fd,"Drop_silence:            %s\n",
                u_profile.flags & USER_OPT_DROP_SILENCE ?
                "enabled" : "disabled");
-       ast_cli(a->fd,"Silence Threshold:       %dms\n",
+       ast_cli(a->fd,"Silence Threshold:       %ums\n",
                u_profile.silence_threshold);
-       ast_cli(a->fd,"Talking Threshold:       %dms\n",
+       ast_cli(a->fd,"Talking Threshold:       %ums\n",
                u_profile.talking_threshold);
        ast_cli(a->fd,"Denoise:                 %s\n",
                u_profile.flags & USER_OPT_DENOISE ?
@@ -1449,14 +1449,14 @@ static char *handle_cli_confbridge_show_bridge_profile(struct ast_cli_entry *e,
        ast_cli(a->fd,"Language:             %s\n", b_profile.language);
 
        if (b_profile.internal_sample_rate) {
-               snprintf(tmp, sizeof(tmp), "%d", b_profile.internal_sample_rate);
+               snprintf(tmp, sizeof(tmp), "%u", b_profile.internal_sample_rate);
        } else {
                ast_copy_string(tmp, "auto", sizeof(tmp));
        }
        ast_cli(a->fd,"Internal Sample Rate: %s\n", tmp);
 
        if (b_profile.mix_interval) {
-               ast_cli(a->fd,"Mixing Interval:      %d\n", b_profile.mix_interval);
+               ast_cli(a->fd,"Mixing Interval:      %u\n", b_profile.mix_interval);
        } else {
                ast_cli(a->fd,"Mixing Interval:      Default 20ms\n");
        }
@@ -1474,7 +1474,7 @@ static char *handle_cli_confbridge_show_bridge_profile(struct ast_cli_entry *e,
                b_profile.rec_file);
 
        if (b_profile.max_members) {
-               ast_cli(a->fd,"Max Members:          %d\n", b_profile.max_members);
+               ast_cli(a->fd,"Max Members:          %u\n", b_profile.max_members);
        } else {
                ast_cli(a->fd,"Max Members:          No Limit\n");
        }
index e2ab2135f3eb9d600e463d4d1bd60cbc240faad2..3f743550cc43d520614acd82a8523e7ebf084e09 100644 (file)
@@ -665,7 +665,7 @@ static int softmix_bridge_write(struct ast_bridge *bridge, struct ast_bridge_cha
                ast_log(LOG_ERROR, "Synchronous bridge action written to a softmix bridge.\n");
                ast_assert(0);
        default:
-               ast_debug(3, "Frame type %d unsupported\n", frame->frametype);
+               ast_debug(3, "Frame type %u unsupported\n", frame->frametype);
                /* "Accept" the frame and discard it. */
                break;
        }
@@ -724,7 +724,7 @@ static unsigned int analyse_softmix_stats(struct softmix_stats *stats, struct so
                 * from the current rate we are using. */
                if (softmix_data->internal_rate != stats->locked_rate) {
                        softmix_data->internal_rate = stats->locked_rate;
-                       ast_debug(1, "Bridge is locked in at sample rate %d\n",
+                       ast_debug(1, "Bridge is locked in at sample rate %u\n",
                                softmix_data->internal_rate);
                        return 1;
                }
@@ -764,14 +764,14 @@ static unsigned int analyse_softmix_stats(struct softmix_stats *stats, struct so
                        }
                }
 
-               ast_debug(1, "Bridge changed from %d To %d\n",
+               ast_debug(1, "Bridge changed from %u To %u\n",
                        softmix_data->internal_rate, best_rate);
                softmix_data->internal_rate = best_rate;
                return 1;
        } else if (!stats->num_at_internal_rate && !stats->num_above_internal_rate) {
                /* In this case, the highest supported rate is actually lower than the internal rate */
                softmix_data->internal_rate = stats->highest_supported_rate;
-               ast_debug(1, "Bridge changed from %d to %d\n",
+               ast_debug(1, "Bridge changed from %u to %u\n",
                        softmix_data->internal_rate, stats->highest_supported_rate);
                return 1;
        }
index 4078b79ba7956d784adea453de29252586105471..a5a8b8588a15ba40e6b8b30967f58d818b3fd6fa 100644 (file)
@@ -620,7 +620,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;
@@ -635,7 +635,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 69066c16276a52cefec9468b1e02a18dbd55375e..87036bbf6b8f63475100b66e2b5af8211039d31d 100644 (file)
@@ -474,11 +474,11 @@ static void odbc_log(struct ast_event *event)
                                } 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 if (strcmp(entry->celname, "eventtype") == 0) {
-                                       snprintf(colbuf, sizeof(colbuf), "%d", record.event_type);
+                                       snprintf(colbuf, sizeof(colbuf), "%u", record.event_type);
                                } else {
                                        colbuf[0] = 0;
                                        unknown = 1;
@@ -692,7 +692,7 @@ static void odbc_log(struct ast_event *event)
                                        break;
                                case SQL_TINYINT:
                                        {
-                                               char integer = 0;
+                                               signed char integer = 0;
                                                if (sscanf(colptr, "%30hhd", &integer) != 1) {
                                                        ast_log(LOG_WARNING, "CEL variable %s is not an integer.\n", entry->name);
                                                        continue;
@@ -705,7 +705,7 @@ static void odbc_log(struct ast_event *event)
                                        break;
                                case SQL_BIT:
                                        {
-                                               char integer = 0;
+                                               signed char integer = 0;
                                                if (sscanf(colptr, "%30hhd", &integer) != 1) {
                                                        ast_log(LOG_WARNING, "CEL variable %s is not an integer.\n", entry->name);
                                                        continue;
index ceaa34e79c068f7fdf7510a8af37631c2dbb7af2..7b1bd09edb866512c3b789b387869ba16cead5f9 100644 (file)
@@ -204,11 +204,11 @@ static void pgsql_log(struct ast_event *event)
                                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 98adfddee4d4ab6567a101872c60866c5719bb69..9d43ba139676c83b6aa74eeee8c98302914c4199 100644 (file)
@@ -207,12 +207,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);
        }
@@ -220,7 +220,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 8084d945137bf7cd2af7611dc9320bbcdf6a9f2a..bd08dd4944f1a0b5e401d08a49ba81e3d9ca7941 100644 (file)
@@ -1545,7 +1545,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_channel_name(ast));
+               (unsigned)f->subclass.integer, f->subclass.integer, ast_channel_name(ast));
 
        if (f->subclass.integer == 'f') {
                if (f->frametype == AST_FRAME_DTMF_END) {
@@ -1644,7 +1644,7 @@ static struct ast_manager_event_blob *dahdichannel_to_ami(struct stasis_message
 
        return ast_manager_event_blob_create(EVENT_FLAG_CALL, "DAHDIChannel",
                "%s"
-               "DAHDISpan: %d\r\n"
+               "DAHDISpan: %u\r\n"
                "DAHDIChannel: %s\r\n",
                ast_str_buffer(channel_string),
                (unsigned int)ast_json_integer_get(span),
@@ -2549,7 +2549,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;
        }
@@ -6978,7 +6978,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_channel_name(ast));
+               (unsigned)f->subclass.integer, f->subclass.integer, ast_channel_name(ast));
 
        if (p->confirmanswer) {
                if (f->frametype == AST_FRAME_DTMF_END) {
@@ -7420,7 +7420,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 */
@@ -7583,7 +7583,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_channel_state(ast));
+                               ast_log(LOG_WARNING, "FXO phone off hook in weird state %u??\n", ast_channel_state(ast));
                        }
                        break;
                case SIG_FXSLS:
@@ -7633,7 +7633,7 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast)
                                        ast_setstate(ast, AST_STATE_UP);
                                }
                        } else if (ast_channel_state(ast) != AST_STATE_RING)
-                               ast_log(LOG_WARNING, "Ring/Off-hook in strange state %d on channel %d\n", ast_channel_state(ast), p->channel);
+                               ast_log(LOG_WARNING, "Ring/Off-hook in strange state %u on channel %d\n", ast_channel_state(ast), p->channel);
                        break;
                default:
                        ast_log(LOG_WARNING, "Don't know how to handle ring/off hook for signalling %d\n", p->sig);
@@ -7877,7 +7877,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_channel_state(ast), p->channel);
+                               ast_debug(1, "Got wink in weird state %u on channel %d\n", ast_channel_state(ast), p->channel);
                        break;
                case SIG_FEATDMF_TA:
                        switch (p->whichwink) {
@@ -7980,7 +7980,7 @@ winkflashdone:
                                        p->polaritydelaytv = ast_tvnow();
                                }
                        } else
-                               ast_debug(1, "Ignore switch to REVERSED Polarity on channel %d, state %d\n", p->channel, ast_channel_state(ast));
+                               ast_debug(1, "Ignore switch to REVERSED Polarity on channel %d, state %u\n", p->channel, ast_channel_state(ast));
                }
                /* 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 */
@@ -7989,21 +7989,21 @@ winkflashdone:
                        (p->polarity == POLARITY_REV) &&
                        ((ast_channel_state(ast) == AST_STATE_UP) || (ast_channel_state(ast) == 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_channel_state(ast), 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_channel_state(ast), 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_channel_state(ast));
+                               ast_debug(1, "Polarity Reversal detected but NOT hanging up (too close to answer event) on channel %d, state %u\n", p->channel, ast_channel_state(ast));
 
                } else {
                        p->polarity = POLARITY_IDLE;
-                       ast_debug(1, "Ignoring Polarity switch to IDLE on channel %d, state %d\n", p->channel, ast_channel_state(ast));
+                       ast_debug(1, "Ignoring Polarity switch to IDLE on channel %d, state %u\n", p->channel, ast_channel_state(ast));
                }
                /* 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_channel_state(ast), 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_channel_state(ast), 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);
@@ -8523,7 +8523,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_channel_name(ast));
+                                               (unsigned)f->subclass.integer, f->subclass.integer, ast_channel_name(ast));
 
                                        f->frametype = AST_FRAME_NULL;
                                        f->subclass.integer = 0;
@@ -8634,7 +8634,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.format.id != AST_FORMAT_SLINEAR) &&
@@ -8826,15 +8826,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) */
@@ -15089,9 +15089,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 {
@@ -15152,7 +15152,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 ");
@@ -15171,7 +15171,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");
@@ -16703,12 +16703,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;
                }
 
@@ -16716,7 +16716,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 032cb216126a93e138fd92d0801f736bcce74a57..7427fe1388fb3e91f24a12723d34ffc7df5f0a33 100644 (file)
@@ -924,8 +924,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),
@@ -1081,7 +1081,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;
@@ -1716,7 +1716,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 a83152b0e87851e90e8751a998f4146d68ebafec..4beacfb2200f9a8f3da98b224aed3aabc2c8351c 100644 (file)
@@ -381,7 +381,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)
@@ -2451,7 +2451,7 @@ static int calltoken_required(struct ast_sockaddr *addr, const char *name, int s
                user_unref(user);
        }
 
-       ast_debug(1, "Determining if address %s with username %s requires calltoken validation.  Optional = %d  calltoken_required = %d \n", ast_sockaddr_stringify_addr(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_sockaddr_stringify_addr(addr), name, optional, calltoken_required);
        if (((calltoken_required == CALLTOKEN_NO) || (calltoken_required == CALLTOKEN_AUTO)) ||
                (optional && (calltoken_required == CALLTOKEN_DEFAULT))) {
                res = 0;
@@ -3330,7 +3330,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\n", f->ts, callno, iaxs[callno]->peercallno, ast_sockaddr_stringify(&iaxs[callno]->addr));
+               ast_debug(3, "Sending %u on %d/%d to %s\n", f->ts, callno, iaxs[callno]->peercallno, ast_sockaddr_stringify(&iaxs[callno]->addr));
        }
        if (f->transfer) {
                iax_outputframe(f, NULL, 0, &iaxs[callno]->transfer, f->datalen - sizeof(struct ast_iax2_full_hdr));
@@ -3489,7 +3489,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_sockaddr_stringify_addr(&iaxs[f->callno]->addr),
                                                ast_channel_name(iaxs[f->callno]->owner),
                                                f->af.frametype,
@@ -5424,7 +5424,7 @@ static int iax2_key_rotate(const void *vpvt)
        ast_mutex_lock(&iaxsl[pvt->callno]);
        pvt->keyrotateid = ast_sched_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));
@@ -5715,7 +5715,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;
                }
@@ -6054,7 +6054,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 */
@@ -6109,7 +6109,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
@@ -6196,7 +6196,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' to %d bytes\n", ast_sockaddr_stringify(&tpeer->addr), tpeer->trunkdataalloc);
+                               ast_debug(1, "Expanded trunk '%s' to %u bytes\n", ast_sockaddr_stringify(&tpeer->addr), tpeer->trunkdataalloc);
                        } else {
                                ast_log(LOG_WARNING, "Maximum trunk data space exceeded to %s\n", ast_sockaddr_stringify(&tpeer->addr));
                                ast_mutex_unlock(&tpeer->lock);
@@ -6336,7 +6336,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;
 
@@ -6383,7 +6383,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))
@@ -6975,10 +6975,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++;
@@ -6992,10 +6992,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++;
@@ -7005,10 +7005,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++;
@@ -7409,8 +7409,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]) {
@@ -7661,7 +7661,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;
        }
@@ -8097,7 +8097,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;
@@ -8229,7 +8229,7 @@ static int register_verify(int callno, struct ast_sockaddr *addr, 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;
                }
@@ -8313,7 +8313,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);
                        }
@@ -9387,7 +9387,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) has %d call chunk%s in transit, %d bytes backloged and has hit a high water mark of %d bytes\n",
+                               ast_verbose(" - Trunk peer (%s) has %d call chunk%s in transit, %u bytes backloged and has hit a high water mark of %u bytes\n",
                                                        ast_sockaddr_stringify(&tpeer->addr),
                                                        res,
                                                        (res != 1) ? "s" : "",
@@ -9579,7 +9579,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",
                        ast_channel_name(iaxs[callno]->owner),
                        iaxs[callno]->pingtime,
                        localjitter,
@@ -10270,7 +10270,7 @@ static int socket_process_helper(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;
@@ -10310,7 +10310,7 @@ static int socket_process_helper(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 */
@@ -10550,7 +10550,7 @@ static int socket_process_helper(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) {
@@ -11007,7 +11007,7 @@ static int socket_process_helper(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);
+                                                       ast_log(LOG_NOTICE, "Peer '%s' is now REACHABLE! Time: %u\n", peer->name, iaxs[fr->callno]->pingtime);
                                                        ast_endpoint_set_state(peer->endpoint, AST_ENDPOINT_ONLINE);
                                                        blob = ast_json_pack("{s: s, s: i}",
                                                                "peer_status", "Reachable",
@@ -11016,7 +11016,7 @@ static int socket_process_helper(struct iax2_thread *thread)
                                                }
                                        } 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);
+                                                       ast_log(LOG_NOTICE, "Peer '%s' is now TOO LAGGED (%u ms)!\n", peer->name, iaxs[fr->callno]->pingtime);
                                                        ast_endpoint_set_state(peer->endpoint, AST_ENDPOINT_ONLINE);
                                                        blob = ast_json_pack("{s: s, s: i}",
                                                                "peer_status", "Lagged",
@@ -11726,7 +11726,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]);
@@ -11737,7 +11737,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]);
@@ -11809,7 +11809,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;
        }
@@ -11824,7 +11824,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
        }
 
index 685575349d0b049a4894bb5d3f471c4665e73d38..68d9848e240592126eceab80171abe0bb9bf6997 100644 (file)
@@ -657,10 +657,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;
 
@@ -677,11 +677,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;
@@ -814,7 +814,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;
        }
@@ -1326,7 +1326,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 ad2b8bc5b51377cee279aab834addf48648758f1..1955edaea4c057485c3a26e74926f612a66bf3e4 100644 (file)
@@ -1245,7 +1245,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 {
@@ -2023,7 +2023,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);
@@ -2123,9 +2123,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) {
@@ -2794,7 +2794,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;
        }
@@ -2808,10 +2808,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) {
@@ -2964,7 +2964,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);
@@ -4207,7 +4207,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v)
                                                e->mwi_event_sub = stasis_subscribe(mailbox_specific_topic, mwi_event_cb, NULL);
                                        }
                                }
-                               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;
                                ast_format_cap_copy(e->cap, global_capability);
@@ -4236,7 +4236,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) {
@@ -4245,7 +4245,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;
@@ -4347,7 +4347,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++) {
@@ -4369,7 +4369,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 80b7f0da02301ab1cdfc63726e950abcca3b7abf..d853839ab21b02771deb635031fb8aacda7c69a7 100644 (file)
@@ -727,7 +727,7 @@ static struct jingle_session *jingle_alloc(struct jingle_endpoint *endpoint, con
        }
 
        if (ast_strlen_zero(sid)) {
-               ast_string_field_build(session, sid, "%08lx%08lx", ast_random(), ast_random());
+               ast_string_field_build(session, sid, "%08lx%08lx", (unsigned long)ast_random(), (unsigned long)ast_random());
                session->outgoing = 1;
                ast_string_field_set(session, audio_name, "audio");
                ast_string_field_set(session, video_name, "video");
@@ -782,7 +782,7 @@ static struct ast_channel *jingle_new(struct jingle_endpoint *endpoint, struct j
                return NULL;
        }
 
-       if (!(chan = ast_channel_alloc(1, state, S_OR(title, ""), S_OR(cid_name, ""), "", "", "", assignedids, requestor, 0, "Motif/%s-%04lx", str, ast_random() & 0xffff))) {
+       if (!(chan = ast_channel_alloc(1, state, S_OR(title, ""), S_OR(cid_name, ""), "", "", "", assignedids, requestor, 0, "Motif/%s-%04lx", str, (unsigned long)(ast_random() & 0xffff)))) {
                return NULL;
        }
 
@@ -941,13 +941,13 @@ static int jingle_add_ice_udp_candidates_to_transport(struct ast_rtp_instance *r
                        break;
                }
 
-               snprintf(tmp, sizeof(tmp), "%d", candidate->id);
+               snprintf(tmp, sizeof(tmp), "%u", candidate->id);
                iks_insert_attrib(local_candidate, "component", tmp);
                snprintf(tmp, sizeof(tmp), "%d", ast_str_hash(candidate->foundation));
                iks_insert_attrib(local_candidate, "foundation", tmp);
                iks_insert_attrib(local_candidate, "generation", "0");
                iks_insert_attrib(local_candidate, "network", "0");
-               snprintf(tmp, sizeof(tmp), "%04lx", ast_random() & 0xffff);
+               snprintf(tmp, sizeof(tmp), "%04lx", (unsigned long)(ast_random() & 0xffff));
                iks_insert_attrib(local_candidate, "id", tmp);
                iks_insert_attrib(local_candidate, "ip", ast_sockaddr_stringify_host(&candidate->address));
                iks_insert_attrib(local_candidate, "port", ast_sockaddr_stringify_port(&candidate->address));
@@ -1339,7 +1339,7 @@ static int jingle_add_payloads_to_description(struct jingle_session *session, st
                if ((format.id == AST_FORMAT_G722) && ((session->transport == JINGLE_TRANSPORT_GOOGLE_V1) || (session->transport == JINGLE_TRANSPORT_GOOGLE_V2))) {
                        iks_insert_attrib(payload, "clockrate", "16000");
                } else {
-                       snprintf(tmp, sizeof(tmp), "%d", ast_rtp_lookup_sample_rate2(1, &format, 0));
+                       snprintf(tmp, sizeof(tmp), "%u", ast_rtp_lookup_sample_rate2(1, &format, 0));
                        iks_insert_attrib(payload, "clockrate", tmp);
                }
 
@@ -1715,7 +1715,7 @@ static int jingle_write(struct ast_channel *ast, struct ast_frame *frame)
                }
                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;
        }
@@ -2145,7 +2145,7 @@ static int jingle_interpret_ice_udp_transport(struct jingle_session *session, ik
                }
 
                if ((sscanf(component, "%30u", &local_candidate.id) != 1) ||
-                   (sscanf(priority, "%30u", &local_candidate.priority) != 1) ||
+                   (sscanf(priority, "%30u", (unsigned *)&local_candidate.priority) != 1) ||
                    (sscanf(port, "%30d", &real_port) != 1)) {
                        jingle_queue_hangup_with_cause(session, AST_CAUSE_PROTOCOL_ERROR);
                        ast_log(LOG_ERROR, "Invalid ICE-UDP candidate information received on session '%s'\n", session->sid);
index 2adef5298d6965aa030f9a4d6a22f02c5b5d0f0a..1e5e19d57ffd02c6268e5a3b8cf071780dceae1c 100644 (file)
@@ -537,7 +537,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_channel_state(ast));
+                               ast_log(LOG_WARNING, "Got off hook in weird state %u\n", ast_channel_state(ast));
                }
        }
 #if 1
@@ -666,7 +666,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.format.id == AST_FORMAT_G723_1 ||
index 13a719851bf8976a3f777b45c957681ce5a81af4..084a256bf4565373e3c55c11fc935552b299031c 100644 (file)
@@ -862,7 +862,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 stasis_subscription *network_change_sub; /*!< subscription id for network change events */
 static struct stasis_subscription *acl_change_sub; /*!< subscription id for named ACL system change events */
@@ -3292,7 +3292,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);
                        }
                }
        }
@@ -3542,7 +3542,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;
 }
@@ -3550,7 +3550,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 */
 }
 
@@ -3988,7 +3988,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?
@@ -4346,7 +4346,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 */
@@ -5066,7 +5066,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, ast_channel_state(chan));
+               ast_debug(1, "Send URL %s, state = %u!\n", data, ast_channel_state(chan));
 
        switch (ast_channel_state(chan)) {
        case AST_STATE_RING:
@@ -5083,7 +5083,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", ast_channel_state(chan));
+               ast_log(LOG_WARNING, "Don't know how to send URI when state is %u!\n", ast_channel_state(chan));
        }
 
        return 0;
@@ -5858,7 +5858,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 ? ast_channel_name(chan) : "<none>");
+       ast_debug(2, "T38 state changed to %u on channel %s\n", p->t38.state, chan ? ast_channel_name(chan) : "<none>");
 
        /* If no channel was provided we can't send off a control frame */
        if (!chan)
@@ -7514,7 +7514,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;
        }
 
@@ -8062,7 +8062,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, assignedids, requestor, 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, assignedids, requestor, 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");
@@ -8511,7 +8511,7 @@ static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p
                                }
                                ast_str_append(&out, 0, " -> ");
                                for (i = 0; i < f->datalen; i++) {
-                                       ast_str_append(&out, 0, "%02X ", arr[i]);
+                                       ast_str_append(&out, 0, "%02X ", (unsigned)arr[i]);
                                }
                                ast_verb(0, "%s\n", ast_str_buffer(out));
                                ast_free(out);
@@ -8635,7 +8635,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;
 }
@@ -8735,13 +8735,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 */
@@ -9041,7 +9041,7 @@ static enum match_req_res match_req_to_dialog(struct sip_pvt *sip_pvt_ptr, struc
                                /* totag did not match what we had stored for them. */
                                char invite_branch[32] = { 0, };
                                if (sip_pvt_ptr->invite_branch) {
-                                       snprintf(invite_branch, sizeof(invite_branch), "z9hG4bK%08x", (int) sip_pvt_ptr->invite_branch);
+                                       snprintf(invite_branch, sizeof(invite_branch), "z9hG4bK%08x", (unsigned)sip_pvt_ptr->invite_branch);
                                }
                                /* Forked Request Detection
                                 *
@@ -10049,7 +10049,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;
@@ -10057,7 +10057,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 last_rtpmap_codec = 0;
        int red_data_pt[10];            /* For T.140 RED */
        int red_num_gen = 0;            /* For T.140 RED */
@@ -10173,7 +10173,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;
                struct ast_rtp_engine_dtls *dtls;
 
                numberofports = 0;
@@ -10218,7 +10218,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, "RTP/SAVPF") || !strcmp(protocol, "UDP/TLS/RTP/SAVPF")) && !ast_test_flag(&p->flags[2], SIP_PAGE3_USE_AVPF)) {
@@ -10290,7 +10290,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
                                                goto process_sdp_cleanup;
                                        }
                                        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);
@@ -10323,7 +10323,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 stream, not supported by Asterisk. Will try anyway...\n", numberofports);
+                                       ast_log(LOG_WARNING, "%u ports offered for video stream, not supported by Asterisk. Will try anyway...\n", numberofports);
                                }
 
                                if (has_media_stream(p, SDP_VIDEO)) {
@@ -10370,7 +10370,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
                                                goto process_sdp_cleanup;
                                        }
                                        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);
                                }
@@ -10402,7 +10402,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 stream, not supported by Asterisk. Will try anyway...\n", numberofports);
+                                       ast_log(LOG_WARNING, "%u ports offered for text stream, not supported by Asterisk. Will try anyway...\n", numberofports);
                                }
 
                                if (!strcmp(protocol, "RTP/AVPF") && !ast_test_flag(&p->flags[2], SIP_PAGE3_USE_AVPF)) {
@@ -10434,7 +10434,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
                                                goto process_sdp_cleanup;
                                        }
                                        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);
                                }
@@ -11068,7 +11068,7 @@ static int process_sdp_a_ice(const char *a, struct sip_pvt *p, struct ast_rtp_in
        int found = FALSE;
        char ufrag[256], pwd[256], foundation[32], transport[4], address[46], cand_type[6], relay_address[46] = "";
        struct ast_rtp_engine_ice_candidate candidate = { 0, };
-       int port, relay_port = 0;
+       unsigned int port, relay_port = 0;
 
        if (!instance || !(ice = ast_rtp_instance_get_ice(instance))) {
                return found;
@@ -11080,7 +11080,7 @@ static int process_sdp_a_ice(const char *a, struct sip_pvt *p, struct ast_rtp_in
        } else if (sscanf(a, "ice-pwd: %255s", pwd) == 1) {
                ice->set_authentication(instance, NULL, pwd);
                found = TRUE;
-       } else if (sscanf(a, "candidate: %31s %30u %3s %30u %23s %30u typ %5s %*s %23s %*s %30u", foundation, &candidate.id, transport, &candidate.priority,
+       } else if (sscanf(a, "candidate: %31s %30u %3s %30u %23s %30u typ %5s %*s %23s %*s %30u", foundation, &candidate.id, transport, (unsigned *)&candidate.priority,
                          address, &port, cand_type, relay_address, &relay_port) >= 7) {
                candidate.foundation = foundation;
                candidate.transport = transport;
@@ -11170,7 +11170,7 @@ static int process_sdp_a_dtls(const char *a, struct sip_pvt *p, struct ast_rtp_i
 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[256];
        unsigned int sample_rate;
@@ -11206,18 +11206,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 %255[^\t\n]", &codec, fmtp_string) == 2) {
                struct ast_format *format;
@@ -11235,7 +11235,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;
@@ -11245,7 +11245,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;
@@ -11255,7 +11255,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;
@@ -11272,7 +11272,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);
@@ -11286,19 +11286,19 @@ static int process_sdp_a_video(const char *a, struct sip_pvt *p, struct ast_rtp_
                                        || !strncasecmp(mimeSubtype, "VP8", 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);
                }
        } else if (sscanf(a, "fmtp: %30u %255s", &codec, fmtp_string) == 2) {
                struct ast_format *format;
@@ -11318,7 +11318,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;
@@ -11336,25 +11336,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;
@@ -11386,10 +11386,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;
@@ -11418,7 +11418,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 '%d'\n", x, p->t38_maxdatagram);
                        x = p->t38_maxdatagram;
                }
                ast_debug(3, "FaxMaxDatagram: %u\n", x);
@@ -11426,7 +11426,7 @@ static int process_sdp_a_image(const char *a, struct sip_pvt *p)
                found = TRUE;
        } else if ((strncmp(attrib, "t38faxfillbitremoval", sizeof("t38faxfillbitremoval") - 1) == 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;
                        }
@@ -11437,7 +11437,7 @@ static int process_sdp_a_image(const char *a, struct sip_pvt *p)
                found = TRUE;
        } else if ((strncmp(attrib, "t38faxtranscodingmmr", sizeof("t38faxtranscodingmmr") - 1) == 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;
                        }
@@ -11448,7 +11448,7 @@ static int process_sdp_a_image(const char *a, struct sip_pvt *p)
                found = TRUE;
        } else if ((strncmp(attrib, "t38faxtranscodingjbig", sizeof("t38faxtranscodingjbig") - 1) == 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;
                        }
@@ -11543,7 +11543,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)) {
@@ -12787,7 +12787,7 @@ static void add_ice_to_sdp(struct ast_rtp_instance *instance, struct ast_str **a
        i = ao2_iterator_init(candidates, 0);
 
        while ((candidate = ao2_iterator_next(&i))) {
-               ast_str_append(a_buf, 0, "a=candidate:%s %d %s %d ", candidate->foundation, candidate->id, candidate->transport, candidate->priority);
+               ast_str_append(a_buf, 0, "a=candidate:%s %u %s %d ", candidate->foundation, candidate->id, candidate->transport, candidate->priority);
                ast_str_append(a_buf, 0, "%s ", ast_sockaddr_stringify_host(&candidate->address));
 
                if (candidate->type == AST_RTP_ICE_CANDIDATE_TYPE_SRFLX
@@ -12889,7 +12889,7 @@ static void add_codec_to_sdp(const struct sip_pvt *p,
        unsigned int rate;
 
        if (debug)
-               ast_verbose("Adding codec %d (%s) to SDP\n", format->id, ast_getformatname(format));
+               ast_verbose("Adding codec %u (%s) to SDP\n", format->id, ast_getformatname(format));
 
        if (((rtp_code = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(p->rtp), 1, format, 0)) == -1) ||
            !(mime = ast_rtp_lookup_mime_subtype2(1, format, 0, ast_test_flag(&p->flags[0], SIP_G726_NONSTANDARD) ? AST_RTP_OPT_G726_NONSTANDARD : 0)) ||
@@ -12905,9 +12905,9 @@ static void add_codec_to_sdp(const struct sip_pvt *p,
        ast_str_append(m_buf, 0, " %d", rtp_code);
        /* Opus mandates 2 channels in rtpmap */
        if ((int)format->id == AST_FORMAT_OPUS) {
-               ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%d/2\r\n", rtp_code, mime, rate);
+               ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%u/2\r\n", rtp_code, mime, rate);
        } else {
-               ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%d\r\n", rtp_code, mime, rate);
+               ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%u\r\n", rtp_code, mime, rate);
        }
 
        ast_format_sdp_generate(format, rtp_code, a_buf);
@@ -12971,7 +12971,7 @@ static void add_vcodec_to_sdp(const struct sip_pvt *p, struct ast_format *format
                return;
 
        if (debug)
-               ast_verbose("Adding video codec %d (%s) to SDP\n", format->id, ast_getformatname(format));
+               ast_verbose("Adding video codec %u (%s) to SDP\n", format->id, ast_getformatname(format));
 
        if (((rtp_code = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(p->vrtp), 1, format, 0)) == -1) ||
            !(subtype = ast_rtp_lookup_mime_subtype2(1, format, 0, 0)) ||
@@ -12980,7 +12980,7 @@ static void add_vcodec_to_sdp(const struct sip_pvt *p, struct ast_format *format
        }
 
        ast_str_append(m_buf, 0, " %d", rtp_code);
-       ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%d\r\n", rtp_code, subtype, rate);
+       ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%u\r\n", rtp_code, subtype, rate);
        /* VP8: add RTCP FIR support */
        if ((int)format->id == AST_FORMAT_VP8) {
                ast_str_append(a_buf, 0, "a=rtcp-fb:* ccm fir\r\n");
@@ -13000,13 +13000,13 @@ static void add_tcodec_to_sdp(const struct sip_pvt *p, struct ast_format *format
                return;
 
        if (debug)
-               ast_verbose("Adding text codec %d (%s) to SDP\n", format->id, ast_getformatname(format));
+               ast_verbose("Adding text codec %u (%s) to SDP\n", format->id, ast_getformatname(format));
 
        if ((rtp_code = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(p->trtp), 1, format, 0)) == -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, format, 0, 0),
                       ast_rtp_lookup_sample_rate2(1, format, 0));
        /* Add fmtp code here */
@@ -13052,12 +13052,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, NULL, format, 0));
+               ast_verbose("Adding non-codec 0x%x (%s) to SDP\n", (unsigned)format, ast_rtp_lookup_mime_subtype2(0, NULL, format, 0));
        if ((rtp_code = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(p->rtp), 0, NULL, 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, NULL, format, 0),
                       ast_rtp_lookup_sample_rate2(0, NULL, format));
        if (format == AST_RTP_DTMF)     /* Indicate we support DTMF and FLASH... */
@@ -13522,8 +13522,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");
                }
@@ -14374,7 +14374,7 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init,
        if (sdp) {
                offered_media_list_destroy(p);
                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 ? ast_channel_name(p->owner) : "<none>");
+                       ast_debug(1, "T38 is in state %u on channel %s\n", p->t38.state, p->owner ? ast_channel_name(p->owner) : "<none>");
                        add_sdp(&req, p, FALSE, FALSE, TRUE);
                } else if (p->rtp) {
                        try_suggested_sip_codec(p);
@@ -14880,7 +14880,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;
        }
 
@@ -15827,7 +15827,7 @@ void sip_auth_headers(enum sip_auth_type code, char **header, char **respheader)
                *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";
        }
 }
@@ -16697,7 +16697,7 @@ static int build_path(struct sip_pvt *p, struct sip_peer *peer, struct sip_reque
 static void build_nonce(struct sip_pvt *p, int forceupdate)
 {
        if (p->stalenonce || forceupdate || ast_strlen_zero(p->nonce)) {
-               ast_string_field_build(p, nonce, "%08lx", ast_random());        /* Create nonce for challenge */
+               ast_string_field_build(p, nonce, "%08lx", (unsigned long)ast_random()); /* Create nonce for challenge */
                p->stalenonce = 0;
        }
 }
@@ -20525,7 +20525,7 @@ static char *_sip_show_peer(int type, int fd, struct mansession *s, const struct
                ast_cli(fd, "  DirectMedACL : %s\n", AST_CLI_YESNO(ast_acl_list_is_empty(peer->directmediaacl) == 0));
                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)));
@@ -20673,7 +20673,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);
@@ -21178,7 +21178,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
@@ -21192,10 +21192,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)));
@@ -22374,7 +22374,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 == AST_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);
@@ -22432,7 +22432,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);
@@ -22444,7 +22444,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);
 
@@ -22613,7 +22613,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->caps);
        } 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;
@@ -25338,7 +25338,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 {
@@ -26092,7 +26092,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, str
                        p->invitestate = INV_TERMINATED;
                        break;
                default:
-                       ast_log(LOG_WARNING, "Don't know how to handle INVITE in state %d\n", ast_channel_state(c));
+                       ast_log(LOG_WARNING, "Don't know how to handle INVITE in state %u\n", ast_channel_state(c));
                        transmit_response(p, "100 Trying", req);
                        break;
                }
@@ -28206,7 +28206,7 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct as
           (could be new request in existing SIP dialog as well...)
         */
        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)) {
@@ -30041,7 +30041,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 8ed469ebea905b15b5793cfb1478258424d6c4f5..01bca4f23e1ff8f583afac3647ce1480a97b416a 100644 (file)
@@ -2022,7 +2022,7 @@ static void skinny_unlocksub(struct skinny_subchannel *sub)
 
 static int skinny_sched_del(int sched_id, struct skinny_subchannel *sub)
 {
-       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Deleting SCHED %d\n",
+       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Deleting SCHED %d\n",
                sub->callid, sched_id);
        return ast_sched_del(sched, sched_id);
 }
@@ -2031,7 +2031,7 @@ static int skinny_sched_add(int when, ast_sched_cb callback, struct skinny_subch
 {
        int ret;
        ret = ast_sched_add(sched, when, callback, sub);
-       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Added SCHED %d\n",
+       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Added SCHED %d\n",
                sub->callid, ret);
        return ret;
 }
@@ -2395,7 +2395,7 @@ static int transmit_response_bysession(struct skinnysession *s, struct skinny_re
        ast_mutex_lock(&s->lock);
 
        if ((letohl(req->len) > SKINNY_MAX_PACKET) || (letohl(req->len) < 0)) {
-               ast_log(LOG_WARNING, "transmit_response: the length of the request (%d) is out of bounds (%d)\n", letohl(req->len), SKINNY_MAX_PACKET);
+               ast_log(LOG_WARNING, "transmit_response: the length of the request (%u) is out of bounds (%d)\n", letohl(req->len), SKINNY_MAX_PACKET);
                ast_mutex_unlock(&s->lock);
                return -1;
        }
@@ -2407,7 +2407,7 @@ static int transmit_response_bysession(struct skinnysession *s, struct skinny_re
        res = write(s->fd, s->outbuf, letohl(req->len)+8);
 
        if (res != letohl(req->len)+8) {
-               ast_log(LOG_WARNING, "Transmit: write only sent %d out of %d bytes: %s\n", res, letohl(req->len)+8, strerror(errno));
+               ast_log(LOG_WARNING, "Transmit: write only sent %d out of %u bytes: %s\n", res, letohl(req->len)+8, strerror(errno));
                if (res == -1) {
                        ast_log(LOG_WARNING, "Transmit: Skinny Client was lost, unregistering\n");
                        end_session(s);
@@ -2671,7 +2671,7 @@ static void transmit_connect(struct skinny_device *d, struct skinny_subchannel *
        req->data.openreceivechannel.echo = htolel(0);
        req->data.openreceivechannel.bitrate = htolel(0);
 
-       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting OPEN_RECEIVE_CHANNEL_MESSAGE to %s, confid %d, partyid %d, ms %d, fmt %d, echo %d, brate %d\n",
+       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting OPEN_RECEIVE_CHANNEL_MESSAGE to %s, confid %u, partyid %u, ms %d, fmt %d, echo %d, brate %d\n",
                d->name, sub->callid, sub->callid, fmt.cur_ms, codec_ast2skinny(&fmt.format), 0, 0);
        transmit_response(d, req);
 }
@@ -2740,7 +2740,7 @@ static void transmit_selectsoftkeys(struct skinny_device *d, int instance, int c
        req->data.selectsoftkey.validKeyMask = htolel(newmask);
 
        SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting SELECT_SOFT_KEYS_MESSAGE to %s, inst %d, callid %d, softkey %d, mask 0x%08x\n",
-               d->name, instance, callid, softkey, newmask);
+               d->name, instance, callid, softkey, (unsigned)newmask);
        transmit_response(d, req);
 }
 
@@ -2860,7 +2860,7 @@ static void _transmit_displayprinotify(struct skinny_device *d, const char *text
                ast_copy_string(req->data.displayprinotify.text, text, sizeof(req->data.displayprinotify.text));
                ast_copy_string(req->data.displayprinotify.text+octalstrlen, extratext, sizeof(req->data.displayprinotify.text)-octalstrlen);
                SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting DISPLAY_PRINOTIFY_MESSAGE to %s, '\\%03o\\%03o', '%s', timeout=%d, priority=%d\n",
-                       d->name, (uint8_t)*text, (uint8_t)*(text+1), extratext, timeout, priority);
+                       d->name, (unsigned)*text, (unsigned)*(text+1), extratext, timeout, priority);
        } else {
                ast_copy_string(req->data.displayprinotify.text, text, sizeof(req->data.displayprinotify.text));
                SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting DISPLAY_PRINOTIFY_MESSAGE to %s, '%s', timeout=%d, priority=%d\n",
@@ -2887,7 +2887,7 @@ static void _transmit_displayprinotifyvar(struct skinny_device *d, const char *t
                ast_copy_string(req->data.displayprinotifyvar.text+octalstrlen, extratext, sizeof(req->data.displayprinotifyvar.text)-octalstrlen);
                packetlen = req->len - MAXDISPLAYNOTIFYSTR + strlen(text) + strlen(extratext);
                SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting DISPLAY_PRINOTIFY_MESSAGE_VARIABLE to %s, '\\%03o\\%03o', '%s', timeout=%d, priority=%d\n",
-                       d->name, (uint8_t)*text, (uint8_t)*(text+1), extratext, timeout, priority);
+                       d->name, (unsigned)*text, (unsigned)*(text+1), extratext, timeout, priority);
        } else {
                ast_copy_string(req->data.displayprinotifyvar.text, text, sizeof(req->data.displayprinotifyvar.text));
                packetlen = req->len - MAXDISPLAYNOTIFYSTR + strlen(text);
@@ -2925,7 +2925,7 @@ static void transmit_displaypromptstatus(struct skinny_device *d, const char *te
                ast_copy_string(req->data.displaypromptstatus.promptMessage, text, sizeof(req->data.displaypromptstatusvar.promptMessage));
                ast_copy_string(req->data.displaypromptstatus.promptMessage+octalstrlen, extratext, sizeof(req->data.displaypromptstatus.promptMessage)-octalstrlen);
                SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting DISPLAY_PROMPT_STATUS_MESSAGE to %s, '\\%03o\\%03o', '%s'\n",
-                       d->name, (uint8_t)*text, (uint8_t)*(text+1), extratext);
+                       d->name, (unsigned)*text, (unsigned)*(text+1), extratext);
        } else {
                ast_copy_string(req->data.displaypromptstatus.promptMessage, text, sizeof(req->data.displaypromptstatus.promptMessage));
                SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting DISPLAY_PROMPT_STATUS_MESSAGE to %s, '%s'\n",
@@ -2951,7 +2951,7 @@ static void transmit_displaypromptstatusvar(struct skinny_device *d, const char
                ast_copy_string(req->data.displaypromptstatusvar.promptMessage+octalstrlen, extratext, sizeof(req->data.displaypromptstatusvar.promptMessage)-octalstrlen);
                packetlen = req->len - MAXCALLINFOSTR + strlen(text) + strlen(extratext);
                SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting DISPLAY_PROMPT_STATUS_MESSAGE_VARIABLE to %s, '\\%03o\\%03o', '%s'\n",
-                       d->name, (uint8_t)*text, (uint8_t)*(text+1), extratext);
+                       d->name, (unsigned)*text, (unsigned)*(text+1), extratext);
        } else {
                ast_copy_string(req->data.displaypromptstatusvar.promptMessage, text, sizeof(req->data.displaypromptstatus.promptMessage));
                packetlen = req->len - MAXCALLINFOSTR + strlen(text);
@@ -3013,7 +3013,7 @@ static void transmit_closereceivechannel(struct skinny_device *d, struct skinny_
        req->data.closereceivechannel.conferenceId = htolel(0);
        req->data.closereceivechannel.partyId = htolel(sub->callid);
 
-       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting CLOSE_RECEIVE_CHANNEL_MESSAGE to %s, confid %d, callid %d\n",
+       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting CLOSE_RECEIVE_CHANNEL_MESSAGE to %s, confid %d, callid %u\n",
                d->name, 0, sub->callid);
        transmit_response(d, req);
 }
@@ -3028,7 +3028,7 @@ static void transmit_stopmediatransmission(struct skinny_device *d, struct skinn
        req->data.stopmedia.conferenceId = htolel(0);
        req->data.stopmedia.passThruPartyId = htolel(sub->callid);
 
-       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting STOP_MEDIA_TRANSMISSION_MESSAGE to %s, confid %d, passthrupartyid %d\n",
+       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting STOP_MEDIA_TRANSMISSION_MESSAGE to %s, confid %d, passthrupartyid %u\n",
                d->name, 0, sub->callid);
        transmit_response(d, req);
 }
@@ -3065,7 +3065,7 @@ static void transmit_startmediatransmission(struct skinny_device *d, struct skin
                req->data.startmedia_ip6.qualifier.bitRate = htolel(0);
        }
 
-       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting START_MEDIA_TRANSMISSION_MESSAGE to %s, callid %d, passthrupartyid %d, ip %s:%d, ms %d, fmt %d, prec 127\n",
+       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting START_MEDIA_TRANSMISSION_MESSAGE to %s, callid %u, passthrupartyid %u, ip %s:%d, ms %d, fmt %d, prec 127\n",
                d->name, sub->callid, sub->callid, ast_inet_ntoa(dest.sin_addr), dest.sin_port, fmt.cur_ms, codec_ast2skinny(&fmt.format));
        transmit_response(d, req);
 }
@@ -3095,7 +3095,7 @@ static void transmit_callstate(struct skinny_device *d, int buttonInstance, unsi
        req->data.callstate.lineInstance = htolel(buttonInstance);
        req->data.callstate.callReference = htolel(callid);
 
-       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting CALL_STATE_MESSAGE to %s, state %s, inst %d, callid %d\n",
+       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting CALL_STATE_MESSAGE to %s, state %s, inst %d, callid %u\n",
                d->name, callstate2str(state), buttonInstance, callid);
        transmit_response(d, req);
 }
@@ -3207,7 +3207,7 @@ static void transmit_definetimedate(struct skinny_device *d)
        req->data.definetimedate.milliseconds = htolel(cmtime.tm_usec / 1000);
        req->data.definetimedate.timestamp = htolel(now.tv_sec);
 
-       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting DEFINETIMEDATE_MESSAGE to %s, date %d %d %d dow %d time %d:%d:%d.%d\n",
+       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting DEFINETIMEDATE_MESSAGE to %s, date %u %u %u dow %u time %u:%u:%u.%u\n",
                d->name, req->data.definetimedate.year, req->data.definetimedate.month, req->data.definetimedate.day, req->data.definetimedate.dayofweek,
                req->data.definetimedate.hour, req->data.definetimedate.minute, req->data.definetimedate.seconds, req->data.definetimedate.milliseconds);
        transmit_response(d, req);
@@ -3295,7 +3295,7 @@ static void transmit_softkeytemplateres(struct skinny_device *d)
                soft_key_template_default,
                sizeof(soft_key_template_default));
 
-       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting SOFT_KEY_TEMPLATE_RES_MESSAGE to %s, offset 0, keycnt %d, totalkeycnt %d, template data\n",
+       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting SOFT_KEY_TEMPLATE_RES_MESSAGE to %s, offset 0, keycnt %u, totalkeycnt %u, template data\n",
                d->name, req->data.softkeytemplate.softKeyCount, req->data.softkeytemplate.totalSoftKeyCount);
        transmit_response(d, req);
 }
@@ -3351,9 +3351,9 @@ static void transmit_registerack(struct skinny_device *d)
 #ifdef AST_DEVMODE
        {
        short res = req->data.regack.res[0] << 8 | req->data.regack.res[1];
-       int res2 = req->data.regack.res2[0] << 24 | req->data.regack.res2[1] << 16 | req->data.regack.res2[2] << 8 | req->data.regack.res2[3];
+       unsigned int res2 = req->data.regack.res2[0] << 24 | req->data.regack.res2[1] << 16 | req->data.regack.res2[2] << 8 | req->data.regack.res2[3];
        SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting REGISTER_ACK_MESSAGE to %s, keepalive %d, datetemplate %s, seckeepalive %d, res 0x%04x, res2 0x%08x\n",
-               d->name, keep_alive, date_format, keep_alive, res, res2);
+               d->name, keep_alive, date_format, keep_alive, (unsigned)res, res2);
        }
 #endif
 
@@ -3381,7 +3381,7 @@ static void transmit_backspace(struct skinny_device *d, int instance, unsigned c
        req->data.bkspmessage.instance = htolel(instance);
        req->data.bkspmessage.callreference = htolel(callid);
 
-       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting BKSP_REQ_MESSAGE to %s, inst %d, callid %d \n",
+       SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting BKSP_REQ_MESSAGE to %s, inst %d, callid %u \n",
                d->name, instance, callid);
        transmit_response(d, req);
 }
@@ -3546,7 +3546,7 @@ static void update_connectedline(struct skinny_subchannel *sub, const void *data
                || ast_strlen_zero(ast_channel_connected(c)->id.number.str))
                return;
 
-       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Updating\n", sub->callid);
+       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Updating\n", sub->callid);
 
        send_callinfo(sub);
 }
@@ -4845,13 +4845,13 @@ static void start_rtp(struct skinny_subchannel *sub)
 static void destroy_rtp(struct skinny_subchannel *sub)
 {
        if (sub->rtp) {
-               SKINNY_DEBUG(DEBUG_AUDIO, 3, "Sub %d - Destroying RTP\n", sub->callid);
+               SKINNY_DEBUG(DEBUG_AUDIO, 3, "Sub %u - Destroying RTP\n", sub->callid);
                ast_rtp_instance_stop(sub->rtp);
                ast_rtp_instance_destroy(sub->rtp);
                sub->rtp = NULL;
        }
        if (sub->vrtp) {
-               SKINNY_DEBUG(DEBUG_AUDIO, 3, "Sub %d - Destroying VRTP\n", sub->callid);
+               SKINNY_DEBUG(DEBUG_AUDIO, 3, "Sub %u - Destroying VRTP\n", sub->callid);
                ast_rtp_instance_stop(sub->vrtp);
                ast_rtp_instance_destroy(sub->vrtp);
                sub->vrtp = NULL;
@@ -4884,7 +4884,7 @@ static void *skinny_newcall(void *data)
        if (!sub->rtp) {
                start_rtp(sub);
        }
-       ast_verb(3, "Sub %d - Calling %s@%s\n", sub->callid, ast_channel_exten(c), ast_channel_context(c));
+       ast_verb(3, "Sub %u - Calling %s@%s\n", sub->callid, ast_channel_exten(c), ast_channel_context(c));
        res = ast_pbx_run(c);
        if (res) {
                ast_log(LOG_WARNING, "PBX exited non-zero\n");
@@ -4900,7 +4900,7 @@ static void skinny_dialer(struct skinny_subchannel *sub, int timedout)
        struct skinny_device *d = l->device;
 
        if (timedout || !ast_matchmore_extension(c, ast_channel_context(c), sub->exten, 1, l->cid_num)) {
-               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Force dialing '%s' because of %s\n", sub->callid, sub->exten, (timedout ? "timeout" : "exactmatch"));
+               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Force dialing '%s' because of %s\n", sub->callid, sub->exten, (timedout ? "timeout" : "exactmatch"));
                if (ast_exists_extension(c, ast_channel_context(c), sub->exten, 1, l->cid_num)) {
                        if (sub->substate == SUBSTATE_OFFHOOK) {
                                dialandactivatesub(sub, sub->exten);
@@ -4913,7 +4913,7 @@ static void skinny_dialer(struct skinny_subchannel *sub, int timedout)
                        dumpsub(sub, 0);
                }
        } else {
-               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Wait for more digits\n", sub->callid);
+               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Wait for more digits\n", sub->callid);
                if (ast_exists_extension(c, ast_channel_context(c), sub->exten, 1, l->cid_num)) {
                        transmit_selectsoftkeys(d, l->instance, sub->callid, KEYDEF_DADFD, KEYMASK_ALL);
                        sub->dialer_sched = skinny_sched_add(matchdigittimeout, skinny_dialer_cb, sub);
@@ -4926,7 +4926,7 @@ static void skinny_dialer(struct skinny_subchannel *sub, int timedout)
 static int skinny_dialer_cb(const void *data)
 {
        struct skinny_subchannel *sub = (struct skinny_subchannel *)data;
-       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Dialer called from SCHED %d\n", sub->callid, sub->dialer_sched);
+       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Dialer called from SCHED %d\n", sub->callid, sub->dialer_sched);
        sub->dialer_sched = 0;
        skinny_dialer(sub, 1);
        return 0;
@@ -4947,7 +4947,7 @@ static int skinny_cfwd_cb(const void *data)
        struct skinny_subchannel *sub = (struct skinny_subchannel *)data;
        struct skinny_line *l = sub->line;
        sub->cfwd_sched = 0;
-       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - CFWDNOANS to %s.\n", sub->callid, l->call_forward_noanswer);
+       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - CFWDNOANS to %s.\n", sub->callid, l->call_forward_noanswer);
        ast_channel_call_forward_set(sub->owner, l->call_forward_noanswer);
        ast_queue_control(sub->owner, AST_CONTROL_REDIRECTING);
        return 0;
@@ -4972,7 +4972,7 @@ static int skinny_call(struct ast_channel *ast, const char *dest, int timeout)
                return -1;
        }
 
-       SKINNY_DEBUG(DEBUG_SUB, 3, "Skinny Call (%s) - Sub %d\n",
+       SKINNY_DEBUG(DEBUG_SUB, 3, "Skinny Call (%s) - Sub %u\n",
                ast_channel_name(ast), sub->callid);
 
        if (l->dnd) {
@@ -5002,7 +5002,7 @@ static int skinny_call(struct ast_channel *ast, const char *dest, int timeout)
                                                sub->aa_mute = 1;
                                        }
                                }
-                               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - setting autoanswer time=%dms %s%s\n",
+                               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - setting autoanswer time=%dms %s%s\n",
                                        sub->callid, aatime, sub->aa_beep ? "BEEP " : "", sub->aa_mute ? "MUTE" : "");
                                if (aatime) {
                                        //sub->aa_sched = ast_sched_add(sched, aatime, skinny_autoanswer_cb, sub);
@@ -5033,7 +5033,7 @@ static int skinny_hangup(struct ast_channel *ast)
 
        dumpsub(sub, 1);
 
-       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Destroying\n", sub->callid);
+       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Destroying\n", sub->callid);
 
        skinny_set_owner(sub, NULL);
        ast_channel_tech_pvt_set(ast, NULL);
@@ -5052,7 +5052,7 @@ static int skinny_answer(struct ast_channel *ast)
 
        sub->cxmode = SKINNY_CX_SENDRECV;
 
-       SKINNY_DEBUG(DEBUG_SUB, 3, "skinny_answer(%s) on %s@%s-%d\n",
+       SKINNY_DEBUG(DEBUG_SUB, 3, "skinny_answer(%s) on %s@%s-%u\n",
                ast_channel_name(ast), sub->line->name, sub->line->device->name, sub->callid);
 
        setsubstate(sub, SUBSTATE_CONNECTED);
@@ -5126,7 +5126,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 {
@@ -5297,7 +5297,7 @@ static void skinny_transfer_attended(struct skinny_subchannel *sub)
        res = ast_bridge_transfer_attended(xferee->owner, xferor->owner);
 
        if (res != AST_BRIDGE_TRANSFER_SUCCESS) {
-               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d failed to transfer %d to '%s'@'%s' - %d\n",
+               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u failed to transfer %u to '%s'@'%s' - %u\n",
                        xferor->callid, xferee->callid, xferor->exten, xferor->line->context, res);
                send_displayprinotify(xferor->line->device, "Transfer failed", NULL, 10, 5);
                ast_queue_control(xferee->owner, AST_CONTROL_HOLD);
@@ -5316,7 +5316,7 @@ static void skinny_transfer_blind(struct skinny_subchannel *sub)
        res = ast_bridge_transfer_blind(1, xferee->owner, sub->exten, sub->line->context, NULL, NULL);
 
        if (res != AST_BRIDGE_TRANSFER_SUCCESS) {
-               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d failed to blind transfer %d to '%s'@'%s' - %d\n",
+               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u failed to blind transfer %u to '%s'@'%s' - %u\n",
                        sub->callid, xferee->callid, sub->exten, sub->line->context, res);
                send_displayprinotify(sub->line->device, "Transfer failed", NULL, 10, 5);
                ast_queue_control(xferee->owner, AST_CONTROL_HOLD);
@@ -5336,7 +5336,7 @@ static int skinny_indicate(struct ast_channel *ast, int ind, const void *data, s
                return -1;
        }
 
-       SKINNY_DEBUG(DEBUG_SUB, 3, "Asked to indicate '%s' condition on channel %s (Sub %d)\n",
+       SKINNY_DEBUG(DEBUG_SUB, 3, "Asked to indicate '%s' condition on channel %s (Sub %u)\n",
                control2str(ind), ast_channel_name(ast), sub->callid);
        switch(ind) {
        case AST_CONTROL_RINGING:
@@ -5489,13 +5489,13 @@ static struct ast_channel *skinny_new(struct skinny_line *l, struct skinny_subli
                ast_channel_named_pickupgroups_set(tmp, l->named_pickupgroups);
 
                if (l->cfwdtype & SKINNY_CFWD_ALL) {
-                       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - CFWDALL to %s.\n", sub->callid, l->call_forward_all);
+                       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - CFWDALL to %s.\n", sub->callid, l->call_forward_all);
                        ast_channel_call_forward_set(tmp, l->call_forward_all);
                } else if ((l->cfwdtype & SKINNY_CFWD_BUSY) && (get_devicestate(l) != AST_DEVICE_NOT_INUSE)) {
-                       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - CFWDBUSY to %s.\n", sub->callid, l->call_forward_busy);
+                       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - CFWDBUSY to %s.\n", sub->callid, l->call_forward_busy);
                        ast_channel_call_forward_set(tmp, l->call_forward_busy);
                } else if (l->cfwdtype & SKINNY_CFWD_NOANSWER) {
-                       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - CFWDNOANS Scheduling for %d seconds.\n", sub->callid, l->callfwdtimeout/1000);
+                       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - CFWDNOANS Scheduling for %d seconds.\n", sub->callid, l->callfwdtimeout/1000);
                        sub->cfwd_sched = skinny_sched_add(l->callfwdtimeout, skinny_cfwd_cb, sub);
                }
 
@@ -5604,7 +5604,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
        if (sub->cfwd_sched) {
                if (state == SUBSTATE_CONNECTED) {
                        if (skinny_sched_del(sub->cfwd_sched, sub)) {
-                               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - trying to change state from %s to %s, but already forwarded because no answer.\n",
+                               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - trying to change state from %s to %s, but already forwarded because no answer.\n",
                                        sub->callid, substate2str(sub->substate), substate2str(actualstate));
                                skinny_unlocksub(sub);
                                return;
@@ -5710,7 +5710,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
                        break;
                case SUBSTATE_HOLD:
                        if (sub->substate != SUBSTATE_CONNECTED) {
-                               ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_HOLD from %s (on call-%d)\n", substate2str(sub->substate), sub->callid);
+                               ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_HOLD from %s (on call-%u)\n", substate2str(sub->substate), sub->callid);
                                return;
                        }
                        transmit_activatecallplane(d, l);
@@ -5727,7 +5727,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
 
                        break;
                default:
-                       ast_log(LOG_WARNING, "Substate handling under subline for state %d not implemented on Sub-%d\n", state, sub->callid);
+                       ast_log(LOG_WARNING, "Substate handling under subline for state %d not implemented on Sub-%u\n", state, sub->callid);
                }
                skinny_unlocksub(sub);
                return;
@@ -5740,7 +5740,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
                        transmit_speaker_mode(d, SKINNY_SPEAKERON);
        }
 
-       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - change state from %s to %s\n",
+       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - change state from %s to %s\n",
                sub->callid, substate2str(sub->substate), substate2str(actualstate));
 
        if (actualstate == sub->substate) {
@@ -5750,7 +5750,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
 
        switch (actualstate) {
        case SUBSTATE_OFFHOOK:
-               ast_verb(1, "Call-id: %d\n", sub->callid);
+               ast_verb(1, "Call-id: %u\n", sub->callid);
                l->activesub = sub;
                transmit_callstate(d, l->instance, sub->callid, SKINNY_OFFHOOK);
                transmit_activatecallplane(d, l);
@@ -5805,7 +5805,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
                break;
        case SUBSTATE_DIALING:
                if (ast_strlen_zero(sub->exten) || !ast_exists_extension(c, ast_channel_context(c), sub->exten, 1, l->cid_num)) {
-                       ast_log(LOG_WARNING, "Exten (%s)@(%s) does not exist, unable to set substate DIALING on sub %d\n", sub->exten, ast_channel_context(c), sub->callid);
+                       ast_log(LOG_WARNING, "Exten (%s)@(%s) does not exist, unable to set substate DIALING on sub %u\n", sub->exten, ast_channel_context(c), sub->callid);
                        break;
                }
 
@@ -5848,7 +5848,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
                break;
        case SUBSTATE_RINGOUT:
                if (!(sub->substate == SUBSTATE_DIALING || sub->substate == SUBSTATE_PROGRESS)) {
-                       ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_RINGOUT from %s (on call-%d)\n", substate2str(sub->substate), sub->callid);
+                       ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_RINGOUT from %s (on call-%u)\n", substate2str(sub->substate), sub->callid);
                        break;
                }
                if (sub->substate != SUBSTATE_PROGRESS) {
@@ -5946,7 +5946,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
                break;
        case SUBSTATE_BUSY:
                if (!(sub->substate == SUBSTATE_DIALING || sub->substate == SUBSTATE_PROGRESS || sub->substate == SUBSTATE_RINGOUT)) {
-                       ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_BUSY from %s (on call-%d)\n", substate2str(sub->substate), sub->callid);
+                       ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_BUSY from %s (on call-%u)\n", substate2str(sub->substate), sub->callid);
                        break;
                }
 
@@ -5960,7 +5960,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
                break;
        case SUBSTATE_CONGESTION:
                if (!(sub->substate == SUBSTATE_DIALING || sub->substate == SUBSTATE_PROGRESS || sub->substate == SUBSTATE_RINGOUT)) {
-                       ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_CONGESTION from %s (on call-%d)\n", substate2str(sub->substate), sub->callid);
+                       ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_CONGESTION from %s (on call-%u)\n", substate2str(sub->substate), sub->callid);
                        break;
                }
 
@@ -5974,7 +5974,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
                break;
        case SUBSTATE_PROGRESS:
                if (sub->substate != SUBSTATE_DIALING) {
-                       ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_PROGRESS from %s (on call-%d)\n", substate2str(sub->substate), sub->callid);
+                       ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_PROGRESS from %s (on call-%u)\n", substate2str(sub->substate), sub->callid);
                        break;
                }
 
@@ -5988,7 +5988,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
                break;
        case SUBSTATE_HOLD:
                if (sub->substate != SUBSTATE_CONNECTED) {
-                       ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_HOLD from %s (on call-%d)\n", substate2str(sub->substate), sub->callid);
+                       ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_HOLD from %s (on call-%u)\n", substate2str(sub->substate), sub->callid);
                        break;
                }
                ast_queue_hold(sub->owner, l->mohsuggest);
@@ -6003,7 +6003,7 @@ static void setsubstate(struct skinny_subchannel *sub, int state)
                sub->substate = SUBSTATE_HOLD;
                break;
        default:
-               ast_log(LOG_WARNING, "Was asked to change to nonexistant substate %d on Sub-%d\n", state, sub->callid);
+               ast_log(LOG_WARNING, "Was asked to change to nonexistant substate %d on Sub-%u\n", state, sub->callid);
        }
        skinny_unlocksub(sub);
 }
@@ -6015,7 +6015,7 @@ static void dumpsub(struct skinny_subchannel *sub, int forcehangup)
        struct skinny_subchannel *activate_sub = NULL;
        struct skinny_subchannel *tsub;
 
-       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Dumping\n", sub->callid);
+       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Dumping\n", sub->callid);
 
        if (!forcehangup && sub->substate == SUBSTATE_HOLD) {
                l->activesub = NULL;
@@ -6030,7 +6030,7 @@ static void dumpsub(struct skinny_subchannel *sub, int forcehangup)
                        setsubstate(sub, SUBSTATE_ONHOOK);
                        l->activesub = activate_sub;
                        if (l->activesub->substate != SUBSTATE_HOLD) {
-                               ast_log(LOG_WARNING, "Sub-%d was related but not at SUBSTATE_HOLD\n", sub->callid);
+                               ast_log(LOG_WARNING, "Sub-%u was related but not at SUBSTATE_HOLD\n", sub->callid);
                                return;
                        }
                        setsubstate(l->activesub, SUBSTATE_HOLD);
@@ -6064,7 +6064,7 @@ static void activatesub(struct skinny_subchannel *sub, int state)
 {
        struct skinny_line *l = sub->line;
 
-       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Activating, and deactivating sub %d\n",
+       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Activating, and deactivating sub %u\n",
                sub->callid, l->activesub ? l->activesub->callid : 0);
 
        if (sub == l->activesub) {
@@ -6088,11 +6088,11 @@ static void dialandactivatesub(struct skinny_subchannel *sub, char exten[AST_MAX
        struct skinny_device *d = l->device;
 
        if (sub->dialType == DIALTYPE_NORMAL) {
-               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Dial %s and Activate\n", sub->callid, exten);
+               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Dial %s and Activate\n", sub->callid, exten);
                ast_copy_string(sub->exten, exten, sizeof(sub->exten));
                activatesub(sub, SUBSTATE_DIALING);
        } else if (sub->dialType == DIALTYPE_CFWD) {
-               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Set callforward(%d) to %s\n", sub->callid, sub->getforward, exten);
+               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Set callforward(%d) to %s\n", sub->callid, sub->getforward, exten);
                set_callforwards(l, sub->exten, sub->getforward);
                dumpsub(sub, 1);
                transmit_cfwdstate(d, l);
@@ -6280,7 +6280,7 @@ static int handle_keypad_button_message(struct skinny_req *req, struct skinnyses
 
        if ((sub->owner && ast_channel_state(sub->owner) <  AST_STATE_UP)) {
                if (sub->dialer_sched && !skinny_sched_del(sub->dialer_sched, sub)) {
-                       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Got a digit and not timed out, so try dialing\n", sub->callid);
+                       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Got a digit and not timed out, so try dialing\n", sub->callid);
                        sub->dialer_sched = 0;
                        len = strlen(sub->exten);
                        if (len == 0) {
@@ -6297,12 +6297,12 @@ static int handle_keypad_button_message(struct skinny_req *req, struct skinnyses
                                skinny_dialer(sub, 0);
                        }
                } else {
-                       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d  Got a digit already timedout, ignore\n", sub->callid);
+                       SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u  Got a digit already timedout, ignore\n", sub->callid);
                        /* Timed out so the call is being progressed elsewhere, to late for digits */
                        return 0;
                }
        } else {
-               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Got a digit and sending as DTMF\n", sub->callid);
+               SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %u - Got a digit and sending as DTMF\n", sub->callid);
                f.subclass.integer = dgt;
                f.src = "skinny";
                if (sub->owner) {
@@ -7295,7 +7295,7 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
        struct skinny_device *d = s->device;
 
        if (!d && !(letohl(req->e) == REGISTER_MESSAGE || letohl(req->e) == ALARM_MESSAGE || letohl(req->e) == KEEP_ALIVE_MESSAGE)) {
-               ast_log(LOG_WARNING, "Client sent message #%d without first registering.\n", req->e);
+               ast_log(LOG_WARNING, "Client sent message #%u without first registering.\n", req->e);
                return 0;
        }
 
@@ -7305,7 +7305,7 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
                handle_keepalive_message(req, s);
                break;
        case REGISTER_MESSAGE:
-               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received REGISTER_MESSAGE from %s, name %s, type %d, protovers %d\n",
+               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received REGISTER_MESSAGE from %s, name %s, type %u, protovers %d\n",
                        d->name, req->data.reg.name, letohl(req->data.reg.type), letohl(req->data.reg.protocolVersion));
                res = skinny_register(req, s);
                if (!res) {
@@ -7327,7 +7327,7 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
                res = handle_ip_port_message(req, s);
                break;
        case KEYPAD_BUTTON_MESSAGE:
-               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received KEYPAD_BUTTON_MESSAGE from %s, digit %d, inst %d, callref %d\n",
+               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received KEYPAD_BUTTON_MESSAGE from %s, digit %u, inst %u, callref %u\n",
                        d->name, letohl(req->data.keypad.button), letohl(req->data.keypad.lineInstance), letohl(req->data.keypad.callReference));
                res = handle_keypad_button_message(req, s);
                break;
@@ -7341,29 +7341,29 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
                res = handle_stimulus_message(req, s);
                break;
        case OFFHOOK_MESSAGE:
-               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received OFFHOOK_MESSAGE from %s, inst %d, ref %d\n",
+               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received OFFHOOK_MESSAGE from %s, inst %u, ref %u\n",
                        d->name, letohl(req->data.offhook.instance), letohl(req->data.offhook.reference));
                res = handle_offhook_message(req, s);
                break;
        case ONHOOK_MESSAGE:
-               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received ONHOOK_MESSAGE from %s, inst %d, ref %d\n",
+               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received ONHOOK_MESSAGE from %s, inst %u, ref %u\n",
                        d->name, letohl(req->data.offhook.instance), letohl(req->data.offhook.reference));
                res = handle_onhook_message(req, s);
                break;
        case CAPABILITIES_RES_MESSAGE:
-               SKINNY_DEBUG(DEBUG_PACKET | DEBUG_AUDIO, 3, "Received CAPABILITIES_RES_MESSAGE from %s, count %d, codec data\n",
+               SKINNY_DEBUG(DEBUG_PACKET | DEBUG_AUDIO, 3, "Received CAPABILITIES_RES_MESSAGE from %s, count %u, codec data\n",
                        d->name, letohl(req->data.caps.count));
                res = handle_capabilities_res_message(req, s);
                break;
        case SPEED_DIAL_STAT_REQ_MESSAGE:
-               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received SPEED_DIAL_STAT_REQ_MESSAGE from %s, sdNum %d\n",
+               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received SPEED_DIAL_STAT_REQ_MESSAGE from %s, sdNum %u\n",
                        d->name, letohl(req->data.speeddialreq.speedDialNumber));
                if ( (sd = find_speeddial_by_instance(s->device, letohl(req->data.speeddialreq.speedDialNumber), 0)) ) {
                        transmit_speeddialstatres(d, sd);
                }
                break;
        case LINE_STATE_REQ_MESSAGE:
-               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received LINE_STATE_REQ_MESSAGE from %s, lineNum %d\n",
+               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received LINE_STATE_REQ_MESSAGE from %s, lineNum %u\n",
                        d->name, letohl(req->data.line.lineNumber));
                transmit_linestatres(d, letohl(req->data.line.lineNumber));
                break;
@@ -7422,7 +7422,7 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
                transmit_serviceurlstat(d, letohl(req->data.serviceurlmessage.instance));
                break;
        default:
-               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received UNKNOWN_MESSAGE(%x) from %s\n", letohl(req->e), d->name);
+               SKINNY_DEBUG(DEBUG_PACKET, 3, "Received UNKNOWN_MESSAGE(%x) from %s\n", (unsigned)letohl(req->e), d->name);
                break;
        }
        return res;
index a3f1c9eedaf346f7505dd8e9d0f83aa2623eb5df..231bf591daf14991c02cac05b7dc03dbc56c859f 100644 (file)
@@ -849,7 +849,7 @@ static const char *ustmtext(const char *str, struct unistimsession *pte)
 static void display_last_error(const char *sz_msg)
 {
        /* Display the error message */
-       ast_log(LOG_WARNING, "%s : (%u) %s\n", sz_msg, errno, strerror(errno));
+       ast_log(LOG_WARNING, "%s : (%d) %s\n", sz_msg, errno, strerror(errno));
 }
 
 static unsigned int get_tick_count(void)
@@ -939,7 +939,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),
@@ -1095,7 +1095,7 @@ static void send_icon(unsigned char pos, unsigned char status, struct unistimses
 {
        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;
@@ -1167,7 +1167,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;
@@ -1379,7 +1379,7 @@ static void close_client(struct unistimsession *s)
                                        ast_queue_hangup_with_cause(sub->owner, AST_CAUSE_NETWORK_OUT_OF_ORDER);
                                } else {
                                        if (unistimdebug) {
-                                               ast_debug(1, "Released sub %d of channel %s@%s\n", sub->subtype, sub->parent->name, s->device->name);
+                                               ast_debug(1, "Released sub %u of channel %s@%s\n", sub->subtype, sub->parent->name, s->device->name);
                                        }
                                        AST_LIST_REMOVE_CURRENT(list);
                                        unistim_free_sub(sub);
@@ -1433,7 +1433,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;
                }
 
@@ -1443,7 +1443,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);
@@ -1524,7 +1524,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;
@@ -1540,8 +1540,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));
@@ -1845,7 +1845,7 @@ static struct unistim_line *unistim_line_alloc(void)
 
 static int unistim_free_sub(struct unistim_subchannel *sub) {
        if (unistimdebug) {
-               ast_debug(1, "Released sub %d of channel %s@%s\n", sub->subtype, sub->parent->name, sub->parent->parent->name);
+               ast_debug(1, "Released sub %u of channel %s@%s\n", sub->subtype, sub->parent->name, sub->parent->parent->name);
        }
        ast_mutex_destroy(&sub->lock);
        ast_free(sub);
@@ -1944,7 +1944,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) {
@@ -2037,7 +2037,7 @@ static void rcv_mac_addr(struct unistimsession *pte, const unsigned char *buf)
                        pte->state = STATE_AUTHDENY;
                        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);
                }
        }
@@ -2090,7 +2090,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;
@@ -2796,7 +2796,7 @@ static void send_dial_tone(struct unistimsession *pte)
                ast_tone_zone_part_parse(s, &tone_data);
                send_tone(pte, tone_data.freq1, tone_data.freq2);
                if (unistimdebug) {
-                       ast_verb(0, "Country code found (%s), freq1=%d freq2=%d\n",
+                       ast_verb(0, "Country code found (%s), freq1=%u freq2=%u\n",
                                                        pte->device->tz->country, tone_data.freq1, tone_data.freq2);
                }
                ts = ast_tone_zone_sound_unref(ts);
@@ -3027,7 +3027,7 @@ static void handle_call_outgoing(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",
                                 sub_trans->owner, ast_channel_name(sub_trans->owner), sub_trans->subtype);
                }
                return;
@@ -4358,7 +4358,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: %s\n", keycode,
+                       ast_verb(0, "Key pressed: keycode = 0x%.2x - current state: %s\n", (unsigned)keycode,
                                                ptestate_tostr(pte->state));
                }
                switch (pte->state) {
@@ -4524,14 +4524,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;
 
@@ -4548,7 +4548,7 @@ 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;
@@ -4556,13 +4556,13 @@ static void parsing(int size, unsigned char *buf, struct unistimsession *pte,
                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);
@@ -4586,7 +4586,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;
@@ -4596,28 +4596,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;
 }
 
@@ -4985,7 +4985,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;
        }
@@ -5042,7 +5042,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;
                }
@@ -5077,7 +5077,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, ast_channel_name(newchan));
 
        if (p->owner != oldchan) {
@@ -5550,7 +5550,7 @@ static struct ast_channel *unistim_new(struct unistim_subchannel *sub, int state
        tmp = ast_channel_alloc(1, state, l->cid_num, NULL, l->accountcode, l->exten,
                l->parent->context, assignedids, requestor, l->amaflags, "USTM/%s@%s-%p", l->name, l->parent->name, sub);
        if (unistimdebug) {
-               ast_verb(0, "unistim_new sub=%d (%p) chan=%p line=%s\n", sub->subtype, sub, tmp, l->name);
+               ast_verb(0, "unistim_new sub=%u (%p) chan=%p line=%s\n", sub->subtype, sub, tmp, l->name);
        }
        if (!tmp) {
                ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
@@ -5903,7 +5903,7 @@ static char *unistim_show_info(struct ast_cli_entry *e, int cmd, struct ast_cli_
                                continue;
                        }
                        ast_cli(a->fd, "==> %d. dev=%s icon=%#-4x label=%-10s number=%-5s sub=%p line=%p\n",
-                               i, device->softkeydevice[i], device->softkeyicon[i], device->softkeylabel[i], device->softkeynumber[i],
+                               i, device->softkeydevice[i], (unsigned)device->softkeyicon[i], device->softkeylabel[i], device->softkeynumber[i],
                                device->ssub[i], device->sline[i]);
                }
                device = device->next;
@@ -5914,7 +5914,7 @@ static char *unistim_show_info(struct ast_cli_entry *e, int cmd, struct ast_cli_
        s = sessions;
        while (s) {
                ast_cli(a->fd,
-                               "sin=%s timeout=%u state=%s macaddr=%s device=%p session=%p\n",
+                               "sin=%s timeout=%d state=%s macaddr=%s device=%p session=%p\n",
                                ast_inet_ntoa(s->sin.sin_addr), s->timeout, ptestate_tostr(s->state), s->macaddr,
                                s->device, s);
                s = s->next;
@@ -6181,7 +6181,7 @@ static int parse_bookmark(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 57262b724a1fde098aae349e1188922446ad469b..a1ee4355054070bb2c49f290aab843200813554e 100644 (file)
@@ -75,7 +75,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 (stat(s, &stbuf) < 0) {
                ast_log(LOG_WARNING, "Failed to stat '%s': %s\n", s, strerror(errno));
index ee4a6c3bef977002eabe1c3c31b0ac61ed2e8653..f5c7ba05d0ab26b840f9aefd35e0d82426103bd4 100644 (file)
@@ -108,7 +108,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++;
        }
 }
@@ -1149,7 +1149,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 86148259aa1d1e3d485620171a68c94bcd600f0e..c50dbf3fc2433e6ffd45101295695f3567001f5c 100644 (file)
@@ -432,9 +432,9 @@ static int channel_read_rtp(struct ast_channel *chan, const char *type, const ch
        } else if (!strcmp(type, "direct")) {
                ast_copy_string(buf, ast_sockaddr_stringify(&media->direct_media_addr), buflen);
        } else if (!strcmp(type, "secure")) {
-               snprintf(buf, buflen, "%u", media->srtp ? 1 : 0);
+               snprintf(buf, buflen, "%d", media->srtp ? 1 : 0);
        } else if (!strcmp(type, "hold")) {
-               snprintf(buf, buflen, "%u", media->held ? 1 : 0);
+               snprintf(buf, buflen, "%d", media->held ? 1 : 0);
        } else {
                ast_log(AST_LOG_WARNING, "Unknown type field '%s' specified for 'rtp' information\n", type);
                return -1;
@@ -580,7 +580,7 @@ static int channel_read_pjsip(struct ast_channel *chan, const char *type, const
        dlg = channel->session->inv_session->dlg;
 
        if (!strcmp(type, "secure")) {
-               snprintf(buf, buflen, "%u", dlg->secure ? 1 : 0);
+               snprintf(buf, buflen, "%d", dlg->secure ? 1 : 0);
        } else if (!strcmp(type, "target_uri")) {
                pjsip_uri_print(PJSIP_URI_IN_REQ_URI, dlg->target, buf, buflen);
                buf_copy = ast_strdupa(buf);
index 51d3f149580325c98df368a64ed4bfa1f57d2059..21b832164307de37f50cbb8b09b89e8c44eb703b 100644 (file)
@@ -338,7 +338,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;
@@ -1555,7 +1555,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_channel_name(ast));
+               (unsigned)f->subclass.integer, f->subclass.integer, ast_channel_name(ast));
 
        if (analog_check_confirmanswer(p)) {
                if (f->frametype == AST_FRAME_DTMF_END) {
@@ -2705,7 +2705,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);
@@ -2884,7 +2884,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 */
@@ -2930,7 +2930,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:
@@ -3038,7 +3038,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_channel_state(ast));
+                               ast_log(LOG_WARNING, "FXO phone off hook in weird state %u??\n", ast_channel_state(ast));
                        }
                        break;
                case ANALOG_SIG_FXSLS:
@@ -3090,7 +3090,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_channel_state(ast), p->channel);
+                               ast_log(LOG_WARNING, "Ring/Off-hook in strange state %u on channel %d\n", ast_channel_state(ast), p->channel);
                                break;
                        }
                        break;
@@ -3142,7 +3142,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 */
@@ -3150,7 +3150,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;
                        }
 
@@ -3352,7 +3352,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_channel_state(ast), p->channel);
+                               ast_debug(1, "Got wink in weird state %u on channel %d\n", ast_channel_state(ast), p->channel);
                        }
                        break;
                case ANALOG_SIG_FEATDMF_TA:
@@ -3490,7 +3490,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_channel_state(ast));
+                                               ast_debug(1, "Ignoring Polarity switch on channel %d, state %u\n", p->channel, ast_channel_state(ast));
                                        }
                                        break;
                                }
@@ -3501,20 +3501,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_channel_state(ast));
+                                               ast_debug(1, "Polarity switch detected but NOT answering (too close to OffHook event) on channel %d, state %u\n", p->channel, ast_channel_state(ast));
                                        }
                                        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_channel_state(ast));
+                                               ast_debug(1, "Polarity switch detected but NOT hanging up (too close to Answer event) on channel %d, state %u\n", p->channel, ast_channel_state(ast));
                                        }
                                        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_channel_state(ast));
+                                               ast_debug(1, "Polarity switch detected (too close to previous event) on channel %d, state %u\n", p->channel, ast_channel_state(ast));
                                        }
                                        break;
                                }
@@ -3522,7 +3522,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_channel_state(ast), 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_channel_state(ast), 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 def6555a9a6addb51aaa1de4378a959cff372871..33bbd9144772791ad6a7d1807e264d28d53291bc 100644 (file)
@@ -754,15 +754,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;
        }
@@ -2427,8 +2427,8 @@ static void party_json_to_ami(struct ast_str **msg, const char *prefix, struct a
        struct ast_json *subaddress = ast_json_object_get(party, "subaddress");
 
        /* Combined party presentation */
-       ast_str_append(msg, 0, "%sPres: %d (%s)\r\n", prefix,
-               (uint32_t)ast_json_integer_get(presentation),
+       ast_str_append(msg, 0, "%sPres: %zd (%s)\r\n", prefix,
+               ast_json_integer_get(presentation),
                ast_json_string_get(presentation_txt));
 
        /* Party number */
@@ -5328,7 +5328,7 @@ static void sig_pri_moh_fsm_event(struct ast_channel *chan, struct sig_pri_chan
        if (orig_state < SIG_PRI_MOH_STATE_IDLE || SIG_PRI_MOH_STATE_NUM <= orig_state
                || !sig_pri_moh_fsm[orig_state]) {
                /* Programming error: State not implemented. */
-               ast_log(LOG_ERROR, "MOH state not implemented: %s(%d)\n",
+               ast_log(LOG_ERROR, "MOH state not implemented: %s(%u)\n",
                        sig_pri_moh_state_str(orig_state), orig_state);
                return;
        }
@@ -8041,7 +8041,7 @@ int sig_pri_call(struct sig_pri_chan *p, struct ast_channel *ast, const char *rd
        if (p->pri->facilityenable)
                pri_facility_enable(p->pri->pri);
 
-       ast_verb(3, "Requested transfer capability: 0x%.2x - %s\n", ast_channel_transfercapability(ast), ast_transfercapability2str(ast_channel_transfercapability(ast)));
+       ast_verb(3, "Requested transfer capability: 0x%.2x - %s\n", (unsigned)ast_channel_transfercapability(ast), ast_transfercapability2str(ast_channel_transfercapability(ast)));
        dp_strip = 0;
        pridialplan = p->pri->dialplan - 1;
        if (pridialplan == -2 || pridialplan == -3) { /* compute dynamically */
@@ -8801,7 +8801,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 6fc83248dd350172a4dd2a290066429e44b15dc7..27ded99b88785a04a35817d14706e4962ba82901 100644 (file)
@@ -684,7 +684,7 @@ int sip_parse_host(char *line, int lineno, char **hostname, int *portnum, enum a
        }
 
        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 21a52d47d182aa8d2505d3862b2498da22d4ca88..b13e2bafdc4775e8786de637daf8fcade7e0c45b 100644 (file)
@@ -1307,7 +1307,7 @@ struct sip_peer {
        int ringing;                    /*!< 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 b763b55925ad7c48f8520203eb1238c95feee229..1ee333fba5c39e21e50ea8d91f430f51af978bcb 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 cca15c3080c28265e3248ba1e263c77b787e1288..82fb4c3487ca39f432b6b4eb9ab83951c192bb19 100644 (file)
@@ -541,7 +541,7 @@ static int func_channel_read(struct ast_channel *chan, const char *function,
                ast_bridge_read_after_goto(chan, buf, len);
        } else if (!strcasecmp(data, "amaflags")) {
                ast_channel_lock(chan);
-               snprintf(buf, len, "%d", ast_channel_amaflags(chan));
+               snprintf(buf, len, "%u", ast_channel_amaflags(chan));
                ast_channel_unlock(chan);
        } else if (!strncasecmp(data, "secure_bridge_", 14)) {
                struct ast_datastore *ds;
index a2f7c2bd25341e17a46a05ffda04abbfb923b013..16f9a7445c8527aa180929966d19ad7f200c63fc 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;
                }
        }
@@ -699,7 +699,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 6452d0bcb56143290caf9f9a031f9463ad9fc96a..ecebde4df0c4dbe797b3017aa9753fa3fc7a3736 100644 (file)
@@ -214,7 +214,7 @@ static void print_frame(struct ast_frame *frame)
        switch (frame->frametype) {
        case AST_FRAME_DTMF_END:
                ast_verbose("FrameType: DTMF END\n");
-               ast_verbose("Digit: 0x%02X '%c'\n", frame->subclass.integer,
+               ast_verbose("Digit: 0x%02X '%c'\n", (unsigned)frame->subclass.integer,
                        frame->subclass.integer < ' ' ? ' ' : frame->subclass.integer);
                break;
        case AST_FRAME_VOICE:
@@ -390,7 +390,7 @@ static void print_frame(struct ast_frame *frame)
                break;
        case AST_FRAME_DTMF_BEGIN:
                ast_verbose("FrameType: DTMF BEGIN\n");
-               ast_verbose("Digit: 0x%02X '%c'\n", frame->subclass.integer,
+               ast_verbose("Digit: 0x%02X '%c'\n", (unsigned)frame->subclass.integer,
                        frame->subclass.integer < ' ' ? ' ' : frame->subclass.integer);
                break;
        case AST_FRAME_BRIDGE_ACTION:
index d85c54e165e62380c30c9dcf0b9b435700dd54e1..0f1c41adb7b75cafc5a9ad43b48d8138d81e5d6e 100644 (file)
@@ -128,7 +128,7 @@ static int hangupcause_read(struct ast_channel *chan, const char *cmd, char *dat
        AST_STANDARD_APP_ARGS(args, parms);
        if (args.argc != 2) {
                /* Must have two arguments. */
-               ast_log(LOG_WARNING, "The HANGUPCAUSE function must have 2 parameters, not %d\n", args.argc);
+               ast_log(LOG_WARNING, "The HANGUPCAUSE function must have 2 parameters, not %u\n", args.argc);
                return -1;
        }
 
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 3baa344e0dac2961be293e5b734603457016b538..7841b6a4e74d281a0dccb65a7a2eac783d44a287 100644 (file)
@@ -284,7 +284,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",
                        ast_channel_name(chan), ast_test_flag(f, AST_FRFLAG_HAS_TIMING_INFO), f->len, f->ts, f->src);
                return -1;
        }
index c341125fd681afe3d91220a98433ba69cb2a8d14..213d6d8aa7c0aa66717a3248fcf804aff50043f7 100644 (file)
@@ -658,7 +658,7 @@ struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha
                parsed_addr = ast_strdupa(ast_sockaddr_stringify(&ha->addr));
                parsed_mask = ast_strdupa(ast_sockaddr_stringify(&ha->netmask));
 
-               ast_debug(3, "%s/%s sense %d appended to ACL\n", parsed_addr, parsed_mask, ha->sense);
+               ast_debug(3, "%s/%s sense %u appended to ACL\n", parsed_addr, parsed_mask, ha->sense);
        }
 
        return ret;
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 e8b23f595facb1d949be5239e55290d5a157583f..7dd888ec2ae8d297aca5719b591bc593942219d4 100644 (file)
@@ -1534,7 +1534,7 @@ static void aoc_d_event(const struct ast_aoc_decoded *decoded, struct ast_str **
                                        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);
                        }
                }
@@ -1597,7 +1597,7 @@ static void aoc_e_event(const struct ast_aoc_decoded *decoded, struct ast_str **
                                        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);
                        }
                }
@@ -1628,7 +1628,7 @@ static struct ast_json *units_to_json(const struct ast_aoc_decoded *decoded)
                if (decoded->unit_list[i].valid_type) {
                        ast_json_object_set(
                                unit, "TypeOf", ast_json_stringf(
-                                       "%d", decoded->unit_list[i].type));
+                                       "%u", decoded->unit_list[i].type));
                }
 
                if (ast_json_array_append(units, unit)) {
index a02c6d671b326e5a818c074c7229d6aad2059cac..a5c4c7af560f80509405ef4dfcf37fd1ab6c1e4b 100644 (file)
@@ -773,7 +773,7 @@ static void linear_release(struct ast_channel *chan, void *params)
        struct linear_state *ls = params;
 
        if (ls->origwfmt.id && ast_set_write_format(chan, &ls->origwfmt)) {
-               ast_log(LOG_WARNING, "Unable to restore channel '%s' to format '%d'\n", ast_channel_name(chan), ls->origwfmt.id);
+               ast_log(LOG_WARNING, "Unable to restore channel '%s' to format '%u'\n", ast_channel_name(chan), ls->origwfmt.id);
        }
 
        if (ls->autoclose) {
@@ -1254,7 +1254,7 @@ static struct ast_frame *make_silence(const struct ast_frame *orig)
                samples += orig->samples;
        }
 
-       ast_verb(4, "Silencing %zd samples\n", samples);
+       ast_verb(4, "Silencing %zu samples\n", samples);
 
 
        datalen = sizeof(short) * samples;
@@ -2004,7 +2004,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));
@@ -2382,7 +2382,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 e3b39302accd6ef94c6b38359c762646eac30e5c..2d3afb549bf0a036b8fd3d3f7ff445f2af5738ef 100644 (file)
@@ -823,14 +823,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);
@@ -1707,7 +1707,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 5aba9ecfbe5d7a7c62b9ffa9f75e7dbba97165f9..091999cdbd8455c6b6aba8efd24db0f71521a93a 100644 (file)
@@ -259,7 +259,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;
        }
 
@@ -968,7 +968,7 @@ int ast_channel_audiohook_count_by_source(struct ast_channel *chan, const char *
                        }
                        break;
                default:
-                       ast_debug(1, "Invalid audiohook type supplied, (%d)\n", type);
+                       ast_debug(1, "Invalid audiohook type supplied, (%u)\n", type);
                        return -1;
        }
 
@@ -1003,7 +1003,7 @@ int ast_channel_audiohook_count_by_source_running(struct ast_channel *chan, cons
                        }
                        break;
                default:
-                       ast_debug(1, "Invalid audiohook type supplied, (%d)\n", type);
+                       ast_debug(1, "Invalid audiohook type supplied, (%u)\n", type);
                        return -1;
        }
        return count;
index 75008fe188f225da0a1cecab9d21154335787766..2b37f25b5b18e4692e29f4151624831a2acd53b6 100644 (file)
@@ -283,7 +283,7 @@ void ast_bridge_channel_leave_bridge_nolock(struct ast_bridge_channel *bridge_ch
                return;
        }
 
-       ast_debug(1, "Setting %p(%s) state from:%d to:%d\n",
+       ast_debug(1, "Setting %p(%s) state from:%u to:%u\n",
                bridge_channel, ast_channel_name(bridge_channel->chan), bridge_channel->state,
                new_state);
 
index f021dffcffae3d0d4e963948a34e6d3f3bf94ea3..78a2289fd0793d88004e764dd0043dcaa0828352 100644 (file)
@@ -903,7 +903,7 @@ static int timeval_str2struct(const struct aco_option *opt, struct ast_variable
 static int timeval_struct2str(const void *obj, const intptr_t *args, char **buf)
 {
        struct timeval *field = (struct timeval *)(obj + args[0]);
-       return (ast_asprintf(buf, "%lu.%06lu", field->tv_sec, (unsigned long)field->tv_usec) < 0) ? -1 : 0;
+       return (ast_asprintf(buf, "%lu.%06lu", (unsigned long)field->tv_sec, (unsigned long)field->tv_usec) < 0) ? -1 : 0;
 }
 
 /*! \brief Initialize bucket support */
index 849579ec8f17675673ca5b287311243689836288..5f53cb2ae9f2113f6593d4714caac618492ae296 100644 (file)
@@ -447,7 +447,7 @@ int callerid_feed_jp(struct callerid_state *cid, unsigned char *ubuf, int len, s
                                                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, s
                                                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, s
                                                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, s
                                                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 625147382aa4c809a0f254c799301537125dda19..09fa2d114c6e829941133de5c936dde51f2809d2 100644 (file)
@@ -2105,7 +2105,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;
 }
 
@@ -2284,7 +2284,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;
 }
@@ -2579,7 +2579,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;
 }
@@ -2684,7 +2684,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);
@@ -2702,7 +2702,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_add(cc_sched_context, when, offer_timer_expire, cc_ref(agent, "Give scheduler an agent ref"))) == -1) {
                return -1;
@@ -2830,7 +2830,7 @@ static void *generic_recall(void *data)
        if (!(chan = ast_request_and_dial(tech, tmp_cap, NULL, 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);
                ast_format_cap_destroy(tmp_cap);
@@ -2854,7 +2854,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_exec_macro(NULL, chan, callback_macro)) {
                        ast_cc_failed(agent->core_id, "Callback macro to %s failed. Maybe a hangup?", agent->device_name);
@@ -2864,7 +2864,7 @@ static void *generic_recall(void *data)
        }
 
        if (!ast_strlen_zero(callback_sub)) {
-               ast_log_dynamic_level(cc_logger_level, "Core %d: There's a callback subroutine configured for agent %s\n",
+               ast_log_dynamic_level(cc_logger_level, "Core %u: There's a callback subroutine configured for agent %s\n",
                                agent->core_id, agent->device_name);
                if (ast_app_exec_sub(NULL, chan, callback_sub, 0)) {
                        ast_cc_failed(agent->core_id, "Callback subroutine to %s failed. Maybe a hangup?", agent->device_name);
@@ -2993,7 +2993,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:
@@ -3036,7 +3036,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;
        }
@@ -3279,7 +3279,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 1828b0a4c9e76c58790b9d422fd8c5428bd2ebb6..17fa8a25fafb00e3a7ae1d2cb492e56c01ecf40d 100644 (file)
@@ -3007,7 +3007,7 @@ static int cdr_object_format_property(struct cdr_object *cdr_obj, const char *na
        } else if (!strcasecmp(name, "billsec")) {
                snprintf(value, length, "%ld", cdr_object_get_billsec(cdr_obj));
        } else if (!strcasecmp(name, "disposition")) {
-               snprintf(value, length, "%d", cdr_obj->disposition);
+               snprintf(value, length, "%u", cdr_obj->disposition);
        } else if (!strcasecmp(name, "amaflags")) {
                snprintf(value, length, "%d", party_a->amaflags);
        } else if (!strcasecmp(name, "accountcode")) {
@@ -3025,7 +3025,7 @@ static int cdr_object_format_property(struct cdr_object *cdr_obj, const char *na
        } else if (!strcasecmp(name, "userfield")) {
                ast_copy_string(value, cdr_obj->party_a.userfield, length);
        } else if (!strcasecmp(name, "sequence")) {
-               snprintf(value, length, "%d", cdr_obj->sequence);
+               snprintf(value, length, "%u", cdr_obj->sequence);
        } else {
                return 1;
        }
@@ -3860,8 +3860,8 @@ static char *handle_cli_status(struct ast_cli_entry *e, int cmd, struct ast_cli_
                        ast_cli(a->fd, "  Safe shutdown:              %s\n", ast_test_flag(&mod_cfg->general->batch_settings.settings, BATCH_MODE_SAFE_SHUTDOWN) ? "Enabled" : "Disabled");
                        ast_cli(a->fd, "  Threading model:            %s\n", ast_test_flag(&mod_cfg->general->batch_settings.settings, BATCH_MODE_SCHEDULER_ONLY) ? "Scheduler only" : "Scheduler plus separate threads");
                        ast_cli(a->fd, "  Current batch size:         %d record%s\n", cnt, ESS(cnt));
-                       ast_cli(a->fd, "  Maximum batch size:         %d record%s\n", mod_cfg->general->batch_settings.size, ESS(mod_cfg->general->batch_settings.size));
-                       ast_cli(a->fd, "  Maximum batch time:         %d second%s\n", mod_cfg->general->batch_settings.time, ESS(mod_cfg->general->batch_settings.time));
+                       ast_cli(a->fd, "  Maximum batch size:         %u record%s\n", mod_cfg->general->batch_settings.size, ESS(mod_cfg->general->batch_settings.size));
+                       ast_cli(a->fd, "  Maximum batch time:         %u second%s\n", mod_cfg->general->batch_settings.time, ESS(mod_cfg->general->batch_settings.time));
                        ast_cli(a->fd, "  Next batch processing time: %ld second%s\n\n", nextbatchtime, ESS(nextbatchtime));
                }
                ast_cli(a->fd, "* Registered Backends\n");
@@ -4093,7 +4093,7 @@ static void cdr_enable_batch_mode(struct ast_cdr_config *config)
        /* Kill the currently scheduled item */
        AST_SCHED_DEL(sched, cdr_sched);
        cdr_sched = ast_sched_add(sched, config->batch_settings.time * 1000, submit_scheduled_batch, NULL);
-       ast_log(LOG_NOTICE, "CDR batch mode logging enabled, first of either size %d or time %d seconds.\n",
+       ast_log(LOG_NOTICE, "CDR batch mode logging enabled, first of either size %u or time %u seconds.\n",
                        config->batch_settings.size, config->batch_settings.time);
 }
 
index e69e64d66d4c4e15e7b498af7cc2e3a54b811043..c9e8c7b24f088ada4ad954b3c83d84ef17baed30 100644 (file)
@@ -738,7 +738,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;
        }
 }
@@ -1198,7 +1198,7 @@ static int __ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, in
 
        if (ast_channel_alert_writable(chan)) {
                if (ast_channel_alert_write(chan)) {
-                       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",
                                ast_channel_name(chan), queued_frames, strerror(errno));
                }
        } else if (ast_channel_timingfd(chan) > -1) {
@@ -2838,7 +2838,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
                                        break;
                                }
                                if (ms == 0) {
-                                       ast_debug(2, "Didn't receive a media frame from %s within %d ms of answering. Continuing anyway\n", ast_channel_name(chan), MAX(delay, 500));
+                                       ast_debug(2, "Didn't receive a media frame from %s within %u ms of answering. Continuing anyway\n", ast_channel_name(chan), MAX(delay, 500));
                                        break;
                                }
                                cur = ast_read(chan);
@@ -4075,7 +4075,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
                                        f->len = option_dtmfminduration;
                                }
                                if (f->len < option_dtmfminduration && !ast_test_flag(ast_channel_flags(chan), AST_FLAG_END_DTMF_ONLY)) {
-                                       ast_log(LOG_DTMF, "DTMF end '%c' has duration %ld but want minimum %d, emulating on %s\n", f->subclass.integer, f->len, option_dtmfminduration, ast_channel_name(chan));
+                                       ast_log(LOG_DTMF, "DTMF end '%c' has duration %ld but want minimum %u, emulating on %s\n", f->subclass.integer, f->len, option_dtmfminduration, ast_channel_name(chan));
                                        ast_set_flag(ast_channel_flags(chan), AST_FLAG_EMULATE_DTMF);
                                        ast_channel_dtmf_digit_to_emulate_set(chan, f->subclass.integer);
                                        ast_channel_emulate_dtmf_duration_set(chan, option_dtmfminduration - f->len);
@@ -4668,14 +4668,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", ast_channel_name(chan), condition);
+               ast_debug(1, "Driver for channel '%s' does not support indication %u, emulating it\n", ast_channel_name(chan), 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, ast_channel_name(chan));
+               ast_log(LOG_WARNING, "Unable to handle indication %u for '%s'\n", condition, ast_channel_name(chan));
        }
 
 indicate_cleanup:
@@ -6448,7 +6448,7 @@ static void channel_do_masquerade(struct ast_channel *original, struct ast_chann
        /* 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",
                ast_channel_name(clonechan), ast_channel_state(clonechan), ast_channel_name(original), ast_channel_state(original));
 
        /*
@@ -6751,7 +6751,7 @@ static void channel_do_masquerade(struct ast_channel *original, struct ast_chann
                pthread_kill(ast_channel_blocker(original), SIGURG);
        }
 
-       ast_debug(1, "Done Masquerading %s (%d)\n", ast_channel_name(original), ast_channel_state(original));
+       ast_debug(1, "Done Masquerading %s (%u)\n", ast_channel_name(original), ast_channel_state(original));
        ast_channel_unlock(original);
 
        if ((bridged = ast_channel_bridge_peer(original))) {
@@ -10339,7 +10339,7 @@ int ast_channel_suppress(struct ast_channel *chan, unsigned int direction, enum
        int framehook_id;
 
        if (!(datastore_info = suppress_get_datastore_information(frametype))) {
-               ast_log(LOG_WARNING, "Attempted to suppress an unsupported frame type (%d).\n", frametype);
+               ast_log(LOG_WARNING, "Attempted to suppress an unsupported frame type (%u).\n", frametype);
                return -1;
        }
 
@@ -10397,7 +10397,7 @@ int ast_channel_unsuppress(struct ast_channel *chan, unsigned int direction, enu
        struct suppress_data *suppress;
 
        if (!(datastore_info = suppress_get_datastore_information(frametype))) {
-               ast_log(LOG_WARNING, "Attempted to unsuppress an unsupported frame type (%d).\n", frametype);
+               ast_log(LOG_WARNING, "Attempted to unsuppress an unsupported frame type (%u).\n", frametype);
                return -1;
        }
 
index fa5cc987a9e61a15f473fb12dd92deb71286ca2b..0fbdb69f675c89d203ba41f174dc8caf2508e282 100644 (file)
@@ -541,7 +541,7 @@ static char *handle_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args
                                        ast_clear_flag(&ast_options, AST_OPT_FLAG_DEBUG_MODULE);
                                }
                                AST_RWLIST_UNLOCK(&debug_modules);
-                               ast_cli(a->fd, "Core debug was %d and has been set to 0 for '%s'.\n",
+                               ast_cli(a->fd, "Core debug was %u and has been set to 0 for '%s'.\n",
                                        ml->level, mod);
                                ast_free(ml);
                                return CLI_SUCCESS;
@@ -549,7 +549,7 @@ static char *handle_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args
 
                        if (ml) {
                                if ((atleast && newlevel < ml->level) || ml->level == newlevel) {
-                                       ast_cli(a->fd, "Core debug is still %d for '%s'.\n", ml->level, mod);
+                                       ast_cli(a->fd, "Core debug is still %u for '%s'.\n", ml->level, mod);
                                        AST_RWLIST_UNLOCK(&debug_modules);
                                        return CLI_SUCCESS;
                                }
@@ -568,7 +568,7 @@ static char *handle_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args
                        }
                        ast_set_flag(&ast_options, AST_OPT_FLAG_DEBUG_MODULE);
 
-                       ast_cli(a->fd, "Core debug was %d and has been set to %d for '%s'.\n",
+                       ast_cli(a->fd, "Core debug was %d and has been set to %u for '%s'.\n",
                                oldval, ml->level, ml->module);
 
                        AST_RWLIST_UNLOCK(&debug_modules);
@@ -1579,7 +1579,7 @@ static char *handle_showchan(struct ast_cli_entry *e, int cmd, struct ast_cli_ar
                "Eff. Connected Line ID Name: %s\n"
                "    DNID Digits: %s\n"
                "       Language: %s\n"
-               "          State: %s (%d)\n"
+               "          State: %s (%u)\n"
                "  NativeFormats: %s\n"
                "    WriteFormat: %s\n"
                "     ReadFormat: %s\n"
index 40d7e84fed6ebc9dd4ed8e2d95a5767df09604d3..0279c1044540022ceae063312b9090d92040d255 100644 (file)
@@ -3088,7 +3088,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 2ec68f6f427935aac5236199bfe81bfb1d25e812..e9d94b218d1ef56c6d4f03fba96ed7e198ba7223 100644 (file)
@@ -326,7 +326,7 @@ int __aco_option_register(struct aco_info *info, const char *name, enum aco_matc
 
        if (!opt->handler && !(opt->handler = ast_config_option_default_handler(opt->type))) {
                /* This should never happen */
-               ast_log(LOG_ERROR, "No handler provided, and no default handler exists for type %d\n", opt->type);
+               ast_log(LOG_ERROR, "No handler provided, and no default handler exists for type %u\n", opt->type);
                ao2_ref(opt, -1);
                return -1;
        };
@@ -1330,10 +1330,10 @@ static int uint_handler_fn(const struct aco_option *opt, struct ast_variable *va
                        ast_parse_arg(var->value, flags, field, (unsigned int) opt->args[1], (unsigned int) opt->args[2]);
                if (res) {
                        if (opt->flags & PARSE_RANGE_DEFAULTS) {
-                               ast_log(LOG_WARNING, "Failed to set %s=%s. Set to %d instead due to range limit (%d, %d)\n", var->name, var->value, *field, (int) opt->args[1], (int) opt->args[2]);
+                               ast_log(LOG_WARNING, "Failed to set %s=%s. Set to %u instead due to range limit (%d, %d)\n", var->name, var->value, *field, (int) opt->args[1], (int) opt->args[2]);
                                res = 0;
                        } else if (opt->flags & PARSE_DEFAULT) {
-                               ast_log(LOG_WARNING, "Failed to set %s=%s, Set to default value %d instead.\n", var->name, var->value, *field);
+                               ast_log(LOG_WARNING, "Failed to set %s=%s, Set to default value %u instead.\n", var->name, var->value, *field);
                                res = 0;
                        }
                }
index 51f03eab39d6e294c262bb3518e8f31a5eaf76d6..bf6b52732fe6bcaffd90eb39b01c7a1ea214627a 100644 (file)
@@ -923,7 +923,7 @@ struct ast_channel *ast_unreal_new_channels(struct ast_unreal_pvt *p,
         */
        if (!(owner = ast_channel_alloc(1, semi1_state, NULL, NULL, NULL,
                        exten, context, &id1, requestor, 0,
-                       "%s/%s-%08x;1", tech->type, p->name, generated_seqno))) {
+                       "%s/%s-%08x;1", tech->type, p->name, (unsigned)generated_seqno))) {
                ast_log(LOG_WARNING, "Unable to allocate owner channel structure\n");
                return NULL;
        }
@@ -962,7 +962,7 @@ struct ast_channel *ast_unreal_new_channels(struct ast_unreal_pvt *p,
 
        if (!(chan = ast_channel_alloc(1, semi2_state, NULL, NULL, NULL,
                        exten, context, &id2, owner, 0,
-                       "%s/%s-%08x;2", tech->type, p->name, generated_seqno))) {
+                       "%s/%s-%08x;2", tech->type, p->name, (unsigned)generated_seqno))) {
                ast_log(LOG_WARNING, "Unable to allocate chan channel structure\n");
                ao2_ref(p, -1);
                ast_channel_release(owner);
index af4abd90207682b30991dc26574419d3de5ff3c0..092d7aad55846ed6b57616ff90e75a6ce13e2b0f 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 218f40aa8a864960090224ff45e444ed6f057d31..b2336210c824c43ef7fa842e6ddf72ed5f640098 100644 (file)
@@ -428,7 +428,7 @@ static void do_state_change(const char *device, enum ast_devstate_cache 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));
 
        ast_publish_device_state(device, state, cachable);
 }
index 6027cd74855a3aaa1044e2d3669651fd676c6416..747ff28e5edf2360b8ed987ccc9608474352a0fb 100644 (file)
@@ -1109,7 +1109,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 7528092e9b0c190bc2fd9e465cf635acb61ac987..e36a9c745696d1df60de944363430fba4a715aea 100644 (file)
@@ -383,7 +383,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;
        }
 
@@ -661,7 +661,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 d183e585e2d3a4ab995b90c51e477ed91e8be5ca..990f62161d19459e28bfe3bdd8238575e5c8844c 100644 (file)
@@ -346,7 +346,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 458f2544627d5ac5f188c056a2de0917e179df3b..df67fbf433a24302941088373cb4d50a3d35b30e 100644 (file)
@@ -606,7 +606,7 @@ static int filehelper(const char *filename, const void *arg2, const char *fmt, c
                                break;
 
                        default:
-                               ast_log(LOG_WARNING, "Unknown helper %d\n", action);
+                               ast_log(LOG_WARNING, "Unknown helper %u\n", action);
                        }
                        ast_free(fn);
                }
index 9c7b5919a92fb4ca9f69a014a6e9aa5d143749d8..a41f26b4cfb43b0c43e88e8fec40f674ad128cb5 100644 (file)
@@ -912,7 +912,7 @@ static char *show_codec_n(struct ast_cli_entry *e, int cmd, struct ast_cli_args
        }
 
        if (!found) {
-               ast_cli(a->fd, "Codec %d not found\n", format_id);
+               ast_cli(a->fd, "Codec %u not found\n", format_id);
        }
 
        f_list = ast_format_list_destroy(f_list);
@@ -1163,7 +1163,7 @@ static int custom_celt_format(struct ast_format_list *entry, unsigned int maxbit
                return -1;
        }
 
-       snprintf(entry->desc, sizeof(entry->desc), "CELT Custom Format %dkhz", entry->samplespersecond/1000);
+       snprintf(entry->desc, sizeof(entry->desc), "CELT Custom Format %ukhz", entry->samplespersecond/1000);
 
        ast_format_append(&entry->format,
                CELT_ATTR_KEY_SAMP_RATE, entry->samplespersecond,
@@ -1216,7 +1216,7 @@ static int custom_silk_format(struct ast_format_list *entry, unsigned int maxbit
                        AST_FORMAT_ATTR_END);
                break;
        default:
-               ast_log(LOG_WARNING, "Custom SILK format definition '%s' can not support sample rate %d\n", entry->name, entry->samplespersecond);
+               ast_log(LOG_WARNING, "Custom SILK format definition '%s' can not support sample rate %u\n", entry->name, entry->samplespersecond);
                return -1;
        }
        ast_format_append(&entry->format,
@@ -1385,7 +1385,7 @@ int ast_format_attr_reg_interface(const struct ast_format_attr_interface *interf
        /* check for duplicates first*/
        if ((wrapper = ao2_find(interfaces, &tmp_wrapper, (OBJ_POINTER | OBJ_NOLOCK)))) {
                ao2_unlock(interfaces);
-               ast_log(LOG_WARNING, "Can not register attribute interface for format id %d, interface already exists.\n", interface->id);
+               ast_log(LOG_WARNING, "Can not register attribute interface for format id %u, interface already exists.\n", interface->id);
                ao2_ref(wrapper, -1);
                return -1;
        }
index 1b13abc690d596e715f501793d35c5dadc6e94b0..76ea3f66c507f10e651b6fbaf61f8d9a3861da73 100644 (file)
@@ -757,7 +757,7 @@ void ast_frame_type2str(enum ast_frame_type frame_type, char *ftype, size_t len)
                ast_copy_string(ftype, "Video", len);
                break;
        default:
-               snprintf(ftype, len, "Unknown Frametype '%d'", frame_type);
+               snprintf(ftype, len, "Unknown Frametype '%u'", frame_type);
                break;
        }
 }
@@ -798,7 +798,7 @@ void ast_frame_dump(const char *name, struct ast_frame *f, char *prefix)
        ast_frame_subclass2str(f, subclass, sizeof(subclass), moreinfo, sizeof(moreinfo));
 
        if (!ast_strlen_zero(moreinfo))
-               ast_verb(-1, "%s [ TYPE: %s (%d) SUBCLASS: %s (%d) '%s' ] [%s]\n",
+               ast_verb(-1, "%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,
@@ -807,7 +807,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_verb(-1, "%s [ TYPE: %s (%d) SUBCLASS: %s (%d) ] [%s]\n",
+               ast_verb(-1, "%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,
@@ -900,7 +900,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 cd15b5b077195bc496a6583ca24820e28b280592..cd35995ad303510eece132ae5721eead433a6ca8 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 8c581838f6d75e387b73a549e8e5dcfc7375587a..e40cbf369082581b3f0fa12de4b503862a9d147d 100644 (file)
@@ -333,7 +333,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);
 
@@ -802,7 +802,7 @@ static void publish_reload_message(const char *name, enum ast_module_reload_resu
        RAII_VAR(struct ast_json *, event_object, NULL, ast_json_unref);
        char res_buffer[8];
 
-       snprintf(res_buffer, sizeof(res_buffer), "%d", result);
+       snprintf(res_buffer, sizeof(res_buffer), "%u", result);
        event_object = ast_json_pack("{s: s, s: s}",
                        "Module", S_OR(name, "All"),
                        "Status", res_buffer);
@@ -1320,7 +1320,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 6c16853c24eb88a20c0a44a626fa66e01c089054..757642fe024cb081abb778d9a354181a83fbcde1 100644 (file)
@@ -246,7 +246,7 @@ static void make_components(struct logchannel *chan)
        unsigned int logmask = 0;
        char *stringp = ast_strdupa(chan->components);
        unsigned int x;
-       int verb_level;
+       unsigned int verb_level;
 
        /* Default to using option_verbose as the verbosity level of the logging channel.  */
        verb_level = -1;
@@ -1037,7 +1037,7 @@ static void ast_log_vsyslog(struct logmsg *msg)
        char call_identifier_str[13];
 
        if (msg->callid) {
-               snprintf(call_identifier_str, sizeof(call_identifier_str), "[C-%08x]", msg->callid->call_identifier);
+               snprintf(call_identifier_str, sizeof(call_identifier_str), "[C-%08x]", (unsigned)msg->callid->call_identifier);
        } else {
                call_identifier_str[0] = '\0';
        }
@@ -1083,7 +1083,7 @@ static void logger_print_normal(struct logmsg *logmsg)
                        char call_identifier_str[13];
 
                        if (logmsg->callid) {
-                               snprintf(call_identifier_str, sizeof(call_identifier_str), "[C-%08x]", logmsg->callid->call_identifier);
+                               snprintf(call_identifier_str, sizeof(call_identifier_str), "[C-%08x]", (unsigned)logmsg->callid->call_identifier);
                        } else {
                                call_identifier_str[0] = '\0';
                        }
@@ -1322,7 +1322,7 @@ void close_logger(void)
 
 void ast_callid_strnprint(char *buffer, size_t buffer_size, struct ast_callid *callid)
 {
-       snprintf(buffer, buffer_size, "[C-%08x]", callid->call_identifier);
+       snprintf(buffer, buffer_size, "[C-%08x]", (unsigned)callid->call_identifier);
 }
 
 struct ast_callid *ast_create_callid(void)
@@ -1960,7 +1960,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();
 
@@ -1998,7 +1998,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 5114b72a0177ff5577d8e4ae24ace964b5cb3d53..1c89fe94bf4a7c372053ba230eda15b5f730c12c 100644 (file)
@@ -2930,7 +2930,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 {
index 90281283d7c58ade7a53bb73a0c074c8cf871e95..63a927246079cb39793967d101e1b0fb0a23359b 100644 (file)
@@ -158,7 +158,7 @@ struct ast_str *ast_manager_build_bridge_state_string_prefix(
                "%sBridgeTechnology: %s\r\n"
                "%sBridgeCreator: %s\r\n"
                "%sBridgeName: %s\r\n"
-               "%sBridgeNumChannels: %d\r\n",
+               "%sBridgeNumChannels: %u\r\n",
                prefix, snapshot->uniqueid,
                prefix, snapshot->subclass,
                prefix, snapshot->technology,
index e61f790a6d162dfe954598f77722f0342b5e9401..507e2c9b44d4cc8b721f3fbcb2dc6bf3ba257009 100644 (file)
@@ -416,7 +416,7 @@ struct ast_str *ast_manager_build_channel_state_string_prefix(
 
        res = ast_str_set(&out, 0,
                "%sChannel: %s\r\n"
-               "%sChannelState: %d\r\n"
+               "%sChannelState: %u\r\n"
                "%sChannelStateDesc: %s\r\n"
                "%sCallerIDNum: %s\r\n"
                "%sCallerIDName: %s\r\n"
index 18bf561f1ad10728f7fedc84214a09f6cab143b9..cf4c792af62d52e4359af4e2bc1d2a0947078733 100644 (file)
@@ -211,10 +211,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;
 }
@@ -246,7 +246,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 f4ed27d618412deca858c3c09aa22586f8358fd7..db274a3ff67eccada8cab4daeaa2be5132a1176e 100644 (file)
@@ -200,7 +200,7 @@ int ast_parking_register_bridge_features(struct ast_parking_bridge_feature_fn_ta
 
        if (fn_table->module_version != PARKING_MODULE_VERSION) {
                ast_log(AST_LOG_WARNING, "Parking module provided incorrect parking module "
-                       "version: %d (expected: %d)\n", fn_table->module_version, PARKING_MODULE_VERSION);
+                       "version: %u (expected: %d)\n", fn_table->module_version, PARKING_MODULE_VERSION);
                return -1;
        }
 
index 4e9a285eeca2cd184623d6ab5f94085a7d0f441e..2d59462d00d763e966fac86906d3f99b9b2de44e 100644 (file)
@@ -3619,7 +3619,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 e47ab833fd814809c463c2b6dbb1d5965c0f73e0..a49a8425e4f82a9816a7c2615ba7d4c9349baa9f 100644 (file)
@@ -1288,7 +1288,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;",
@@ -1796,7 +1796,7 @@ static struct ast_manager_event_blob *rtcp_report_to_ami(struct stasis_message *
 
                ast_str_append(&report_string, 0, "Report%dSourceSSRC: 0x%.8x\r\n",
                                i, payload->report->report_block[i]->source_ssrc);
-               ast_str_append(&report_string, 0, "Report%dFractionLost: %u\r\n",
+               ast_str_append(&report_string, 0, "Report%dFractionLost: %d\r\n",
                                i, payload->report->report_block[i]->lost_count.fraction);
                ast_str_append(&report_string, 0, "Report%dCumulativeLost: %u\r\n",
                                i, payload->report->report_block[i]->lost_count.packets);
index fa809e17220451c6b683b3638a45e7278948d8eb..a67f2f826d352b76282c358ffb7e55df8da176e1 100644 (file)
@@ -506,7 +506,7 @@ void ast_sched_report(struct ast_sched_context *con, struct ast_str **buf, struc
        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);
 
@@ -543,9 +543,9 @@ void ast_sched_dump(struct ast_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 9588f78a890210ee3f2ccc77cd9f87b3775cf085..b3181d4e7041fb6c74385a32d28293cca8e55826 100644 (file)
@@ -969,7 +969,7 @@ static int add_json_object(struct ast_json *json, const struct ast_security_even
 
                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;
                        break;
@@ -995,7 +995,7 @@ static int add_json_object(struct ast_json *json, const struct ast_security_even
                uint32_t val;
                val = *((const uint32_t *)(((const char *) sec) + ie_type->offset));
 
-               json_string = ast_json_stringf("%d", val);
+               json_string = ast_json_stringf("%u", val);
                if (!json_string) {
                        res = -1;
                        break;
@@ -1014,7 +1014,7 @@ static int add_json_object(struct ast_json *json, const struct ast_security_even
 
                if (req && !addr->addr) {
                        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;
                }
@@ -1033,7 +1033,7 @@ static int add_json_object(struct ast_json *json, const struct ast_security_even
 
                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;
                }
@@ -1082,7 +1082,7 @@ static struct ast_json *alloc_security_event_json_object(const struct ast_securi
                return NULL;
        }
 
-       json_temp = ast_json_stringf("%d", sec->version);
+       json_temp = ast_json_stringf("%u", sec->version);
        if (!json_temp || ast_json_object_set(json_object, ast_event_get_ie_type_name(AST_EVENT_IE_EVENT_VERSION), json_temp)) {
                return NULL;
        }
index 687a6c02dbc08df823621ac545a61267b3b2fd90..44efc420f3d13c32d5a00919ff78512550bf6048 100644 (file)
@@ -91,7 +91,7 @@ int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f)
 
                if (!sf->trans) {
                        if (!(sf->trans = ast_translator_build_path(&sf->output_format, &f->subclass.format))) {
-                               ast_log(LOG_WARNING, "Cannot build a path from %s (%d)to %s (%d)\n",
+                               ast_log(LOG_WARNING, "Cannot build a path from %s (%u)to %s (%u)\n",
                                        ast_getformatname(&f->subclass.format),
                                        f->subclass.format.id,
                                        ast_getformatname(&sf->output_format),
index 5ca43b81833d951c36f586d81f598d947f374425..b2745d919f7d358f291f7bd8b8ea29791b8e2f97 100644 (file)
@@ -309,7 +309,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 3b4d2ad6b18e2964ba1086326541ce133a4123b1..268bbe4decbaa711937b6f36acd2d14c385cca20 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,
@@ -353,7 +353,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 ac8df9772957926ee7314833ee4d6e825a8514f1..0582f76fa86c9ad00c2a0909b738080d68b10410 100644 (file)
@@ -444,7 +444,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 84e24e56fb2e5f817cf55196d21e5cfe69b26efa..c14ad019c358d0348016ccd97a2f68c938c83250 100644 (file)
@@ -536,7 +536,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.format)));
                        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 {
@@ -773,7 +773,7 @@ static void matrix_rebuild(int samples)
                                                matrix_get(x, z)->table_cost = newtablecost;
                                                matrix_get(x, z)->multistep = 1;
                                                changed++;
-                                               ast_debug(10, "Discovered %d cost path from %s to %s, via %s\n",
+                                               ast_debug(10, "Discovered %u cost path from %s to %s, via %s\n",
                                                        matrix_get(x, z)->table_cost,
                                                        ast_getformatname(ast_format_set(&tmpx, index2format(x), 0)),
                                                        ast_getformatname(ast_format_set(&tmpy, index2format(z), 0)),
@@ -913,7 +913,7 @@ static char *handle_show_translation_table(struct ast_cli_args *a)
 
                        if (x >= 0 && y >= 0 && matrix_get(x, y)->step) {
                                /* Actual codec output */
-                               ast_str_append(&out, 0, "%*d", curlen + 1, (matrix_get(x, y)->table_cost/100));
+                               ast_str_append(&out, 0, "%*u", curlen + 1, (matrix_get(x, y)->table_cost/100));
                        } else if (i == -1 && k >= 0) {
                                /* Top row - use a dynamic size */
                                ast_str_append(&out, 0, "%*s", curlen + 1, ast_getformatname(&f_list[k].format));
index acbb4d78e450d4e96964cc2e824fa83554b37dc2..c8fee019b54149e34d6fa2dbf1ea6a480d177883 100644 (file)
@@ -365,7 +365,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;
                }
@@ -443,7 +443,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.integer = AST_MODEM_T38;
 
@@ -1158,7 +1158,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;
@@ -1176,7 +1176,7 @@ int ast_udptl_write(struct ast_udptl *s, struct ast_frame *f)
                                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);
                }
        }
@@ -1330,7 +1330,7 @@ static int udptl_pre_apply_config(void) {
        /* Fix up any global config values that we can handle before replacing the config */
        if (cfg->general->use_even_ports && (cfg->general->start & 1)) {
                ++cfg->general->start;
-               ast_log(LOG_NOTICE, "Odd numbered udptlstart specified but use_even_ports enabled. udptlstart is now %d\n", cfg->general->start);
+               ast_log(LOG_NOTICE, "Odd numbered udptlstart specified but use_even_ports enabled. udptlstart is now %u\n", cfg->general->start);
        }
        if (cfg->general->start > cfg->general->end) {
                ast_log(LOG_WARNING, "Unreasonable values for UDPTL start/end ports; defaulting to %s-%s.\n", __stringify(DEFAULT_UDPTLSTART), __stringify(DEFAULT_UDPTLEND));
@@ -1339,7 +1339,7 @@ static int udptl_pre_apply_config(void) {
        }
        if (cfg->general->use_even_ports && (cfg->general->end & 1)) {
                --cfg->general->end;
-               ast_log(LOG_NOTICE, "Odd numbered udptlend specified but use_even_ports enabled. udptlend is now %d\n", cfg->general->end);
+               ast_log(LOG_NOTICE, "Odd numbered udptlend specified but use_even_ports enabled. udptlend is now %u\n", cfg->general->end);
        }
 
        return 0;
index 6c022416a8cc35824c31eab7d439e7b31ff01e0f..acbac97b324bb8eb646d2a241b336fb3af3a4971 100644 (file)
@@ -251,7 +251,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. */
@@ -269,7 +269,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 Produce a 20 byte SHA1 hash of value. */
@@ -420,7 +420,7 @@ char *ast_uri_encode(const char *string, char *outbuf, int buflen, struct ast_fl
                        if (out - outbuf >= buflen - 3) {
                                break;
                        }
-                       out += sprintf(out, "%%%02X", (unsigned char) *ptr);
+                       out += sprintf(out, "%%%02X", (unsigned) *ptr);
                } else {
                        *out = *ptr;    /* Continue copying the string */
                        out++;
index 7a48c87015a50dba7e22b3024cb1ba737a81aeca..431eb1dd723224746dfcc7675eaefe04c561b2cd 100644 (file)
@@ -2765,7 +2765,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 48f17107f5fb755a42d13d8c5cb562a0946795ec..ca219fd1e2fe07a62c5167cf60b64199b5f0adf5 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);
 }
@@ -464,7 +464,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 -- OSeqno: %3.3d ISeqno: %3.3d Type: %s (%s)\n",
index b3cc211b074ee19f89de61164fc8a79a7f6c6418..478d3ce54ab49336ad487af28eed46adf4aa753c 100644 (file)
@@ -538,7 +538,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 1d9ea840ce7b5b4faa995d6d64d0e580ecba8a5f..d3e81a8d1d04f08c9936958d2dd84ea9a4e22284 100644 (file)
@@ -926,7 +926,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));
        }
@@ -1185,7 +1185,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) {
@@ -1255,7 +1255,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, crc);
        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);
@@ -1270,7 +1270,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, crc);
                        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);
@@ -2967,7 +2967,7 @@ static char *dundi_show_cache(struct ast_cli_entry *e, int cmd, struct ast_cli_a
 
                ptr = db_entry->data + length + 1;
 
-               if ((sscanf(ptr, "%30d/%30d/%30d/%n", &(flags.flags), &weight, &tech, &length) != 3)) {
+               if ((sscanf(ptr, "%30u/%30d/%30d/%n", &(flags.flags), &weight, &tech, &length) != 3)) {
                        continue;
                }
 
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 96d3906ac5523a2e10392839f990524fab9ab8bd..e223603a6299a1b883b844f076dea8f7813fd382 100644 (file)
@@ -2827,7 +2827,7 @@ static int handle_channelstatus(struct ast_channel *chan, AGI *agi, int argc, co
 {
        if (argc == 2) {
                /* no argument: supply info on the current channel */
-               ast_agi_send(agi->fd, chan, "200 result=%d\n", ast_channel_state(chan));
+               ast_agi_send(agi->fd, chan, "200 result=%u\n", ast_channel_state(chan));
                return RESULT_SUCCESS;
        } else if (argc == 3) {
                RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup);
@@ -2836,7 +2836,7 @@ static int handle_channelstatus(struct ast_channel *chan, AGI *agi, int argc, co
                if ((msg = stasis_cache_get(ast_channel_cache_by_name(), ast_channel_snapshot_type(), argv[2]))) {
                        struct ast_channel_snapshot *snapshot = stasis_message_data(msg);
 
-                       ast_agi_send(agi->fd, chan, "200 result=%d\n", snapshot->state);
+                       ast_agi_send(agi->fd, chan, "200 result=%u\n", snapshot->state);
                        return RESULT_SUCCESS;
                }
                /* if we get this far no channel name matched the argument given */
index 7736ef52f9c1bb404c94ba6079446f2a4b0b641a..3c8dd4f2bfffb2dd25c790ab9746c8211f2e952f 100644 (file)
@@ -177,7 +177,7 @@ int ast_ari_validate_list(struct ast_json *json, int (*fn)(struct ast_json *))
                member_res = fn(ast_json_array_get(json, i));
                if (!member_res) {
                        ast_log(LOG_ERROR,
-                               "Array member %zd failed validation\n", i);
+                               "Array member %zu failed validation\n", i);
                        res = 0;
                }
        }
index e6c93fdc7606a536875255ba04fffd931b365fef..ae52cbfce798151a17fce0e06240af985c87e894 100644 (file)
@@ -697,7 +697,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++) {
@@ -1368,7 +1368,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 {
@@ -1429,7 +1429,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;
        }
 
@@ -1729,7 +1729,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 0bf3e63cc7d16dee725df747bf7e374988945aaa..d9dde31c256ab9aef5f5d60aa3ec29ff2c857933 100644 (file)
@@ -202,7 +202,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);
@@ -401,7 +404,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 c6d827fe8b296492abe2a2d7a396b5bfd1e467e5..fe8c8a7bb50a9fc11df2697e76edbc0137ac71d4 100644 (file)
@@ -457,7 +457,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 84b4e684538da5ae381dca9a9f501fe4fc633c2e..ef2d9173d12a9c8d780ff9275112d71102e3106a 100644 (file)
@@ -246,7 +246,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 b293841d30ab20122238af2965e412f7d59d3471..685aa1fa953f012aeaed02394fd190ceb097fecb 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);
                }
        }
@@ -109,7 +109,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)) {
@@ -122,7 +122,7 @@ static SQLHSTMT custom_prepare(struct odbc_obj *obj, void *data)
                const char *newval = field->value;
 
                if ((1LL << count++) & cps->skip) {
-                       ast_debug(1, "Skipping field '%s'='%s' (%llo/%llo)\n", field->name, newval, 1LL << (count - 1), cps->skip);
+                       ast_debug(1, "Skipping field '%s'='%s' (%llo/%llo)\n", field->name, newval, 1ULL << (count - 1), cps->skip);
                        continue;
                }
                ast_debug(1, "Parameter %d ('%s') = '%s'\n", x, field->name, newval);
index fc15dc52d32b3f85faaf6501d29d073fd1e607d9..ce4165498cc7347269120a9695d982a6c4fc87da 100644 (file)
@@ -231,13 +231,13 @@ static void *dispatch_thread_handler(void *data)
 
                if (pfd[0].revents & POLLIN) {
                        if ((cs_err = cpg_dispatch(cpg_handle, CS_DISPATCH_ALL)) != CS_OK) {
-                               ast_log(LOG_WARNING, "Failed CPG dispatch: %d\n", cs_err);
+                               ast_log(LOG_WARNING, "Failed CPG dispatch: %u\n", cs_err);
                        }
                }
 
                if (pfd[1].revents & POLLIN) {
                        if ((cs_err = corosync_cfg_dispatch(cfg_handle, CS_DISPATCH_ALL)) != CS_OK) {
-                               ast_log(LOG_WARNING, "Failed CFG dispatch: %d\n", cs_err);
+                               ast_log(LOG_WARNING, "Failed CFG dispatch: %u\n", cs_err);
                        }
                }
 
@@ -314,7 +314,7 @@ static void ast_event_cb(const struct ast_event *event, void *data)
         * these events, so just send away. */
 
        if ((cs_err = cpg_mcast_joined(cpg_handle, CPG_TYPE_FIFO, &iov, 1)) != CS_OK) {
-               ast_log(LOG_WARNING, "CPG mcast failed (%d)\n", cs_err);
+               ast_log(LOG_WARNING, "CPG mcast failed (%u)\n", cs_err);
        }
 }
 
@@ -368,7 +368,7 @@ static char *corosync_show_members(struct ast_cli_entry *e, int cmd, struct ast_
                        continue;
                }
 
-               ast_cli(a->fd, "=== Node %d\n", i);
+               ast_cli(a->fd, "=== Node %u\n", i);
                ast_cli(a->fd, "=== --> Group: %s\n", cpg_desc.group.value);
 
                for (j = 0; j < num_addrs; j++) {
@@ -378,7 +378,7 @@ static char *corosync_show_members(struct ast_cli_entry *e, int cmd, struct ast_
 
                        getnameinfo(sa, sa_len, buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
 
-                       ast_cli(a->fd, "=== --> Address %d: %s\n", j + 1, buf);
+                       ast_cli(a->fd, "=== --> Address %u: %s\n", j + 1, buf);
                }
 
        }
index 30c51194aa03ddf08a40b924c31fddcaa3973272..22b82dc3496fec9ef064bfb736c7a9a936cbad50 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 3725b1437107effb9bcb5ff1c457e6a3aee16989..e9a127d51aa2e8d99576fb2c365258b81886a072 100644 (file)
@@ -407,7 +407,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");
@@ -807,7 +807,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";
        }
 }
@@ -1081,11 +1081,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;
 }
@@ -1221,7 +1221,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);
 }
 
@@ -1243,7 +1243,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", ast_channel_name(chan), fax->id, reason, errorstr); \
+               ast_log(LOG_ERROR, "channel '%s' FAX session '%u' failure, reason: '%s' (%s)\n", ast_channel_name(chan), fax->id, reason, errorstr); \
                GENERIC_FAX_EXEC_ERROR_QUIET(fax, chan, errorstr, reason); \
        } while (0)
 
@@ -1416,7 +1416,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", ast_channel_name(chan), fax->id);
+                       ast_log(LOG_WARNING, "Channel '%s' FAX session '%u' failed to obtain a smoother.\n", ast_channel_name(chan), fax->id);
                }
        } else {
                expected_frametype = AST_FRAME_MODEM;
@@ -1504,7 +1504,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", ast_channel_name(chan), fax->id);
+                                       ast_verb(3, "Channel '%s' switched to T.38 FAX session '%u'.\n", ast_channel_name(chan), fax->id);
                                }
                        } else if ((frame->frametype == expected_frametype) &&
                                   (!memcmp(&frame->subclass, &expected_framesubclass, sizeof(frame->subclass)))) {
@@ -1876,13 +1876,13 @@ 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);
                return -1;
        }
 
        if (check_modem_rate(details->modems, details->minrate)) {
                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);
@@ -1891,7 +1891,7 @@ static int receivefax_exec(struct ast_channel *chan, const char *data)
 
        if (check_modem_rate(details->modems, details->maxrate)) {
                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);
@@ -2383,13 +2383,13 @@ 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);
                return -1;
        }
 
        if (check_modem_rate(details->modems, details->minrate)) {
                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);
@@ -2398,7 +2398,7 @@ static int sendfax_exec(struct ast_channel *chan, const char *data)
 
        if (check_modem_rate(details->modems, details->maxrate)) {
                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);
@@ -3175,7 +3175,7 @@ static struct ast_frame *fax_gateway_framehook(struct ast_channel *chan, struct
                active = chan;
                break;
        default:
-               ast_log(LOG_WARNING, "unhandled framehook event %i\n", event);
+               ast_log(LOG_WARNING, "unhandled framehook event %u\n", event);
                return f;
        }
 
@@ -3560,7 +3560,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);
@@ -3663,7 +3663,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;
 }
@@ -3691,8 +3691,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");
@@ -3726,7 +3726,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;
        }
@@ -3833,7 +3833,7 @@ static char *cli_fax_show_sessions(struct ast_cli_entry *e, int cmd, struct ast_
 
                filenames = generate_filenames_string(s->details, "", ", ");
 
-               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,
                        cli_session_type(s),
                        cli_session_operation(s),
@@ -3947,28 +3947,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;
        }
@@ -4023,11 +4023,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")) {
@@ -4035,7 +4035,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 1ddf566cac2ef10df2e0ac4a38b1e8f177dcd6ca..015e6970404bdf9ef863e4adcf1d6c1d3f622959 100644 (file)
@@ -362,7 +362,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;
 
@@ -379,7 +379,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);
@@ -537,7 +537,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;
        }
 
@@ -611,14 +611,14 @@ static struct ast_frame *spandsp_fax_read(struct ast_fax_session *s)
        ast_format_set(&fax_frame.subclass.format, AST_FORMAT_SLINEAR, 0);
 
        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;
        }
 
@@ -661,7 +661,7 @@ static int spandsp_v21_detect(struct ast_fax_session *s, const struct ast_frame
                return -1;
        }
 
-       ast_debug(5, "frame={ datalen=%d, samples=%d, mallocd=%d, src=%s, flags=%d, ts=%ld, len=%ld, seqno=%d, data.ptr=%p, subclass.format.id=%d  }\n", f->datalen, f->samples, f->mallocd, f->src, f->flags, f->ts, f->len, f->seqno, f->data.ptr, f->subclass.format.id);
+       ast_debug(5, "frame={ datalen=%d, samples=%d, mallocd=%d, src=%s, flags=%u, ts=%ld, len=%ld, seqno=%d, data.ptr=%p, subclass.format.id=%u  }\n", f->datalen, f->samples, f->mallocd, f->src, f->flags, f->ts, f->len, f->seqno, f->data.ptr, f->subclass.format.id);
 
        /* slinear frame can be passed to spandsp */
        if (f->subclass.format.id == AST_FORMAT_SLINEAR) {
@@ -684,7 +684,7 @@ static int spandsp_v21_detect(struct ast_fax_session *s, const struct ast_frame
 
        /* frame in other formats cannot be passed to spandsp, it could cause segfault */
        } else {
-               ast_log(LOG_WARNING, "Unknown frame format %d, v.21 detection skipped\n", f->subclass.format.id);
+               ast_log(LOG_WARNING, "Unknown frame format %u, v.21 detection skipped\n", f->subclass.format.id);
                return -1;
        }
 
@@ -720,7 +720,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;
        }
 
@@ -964,7 +964,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;
        }
 
@@ -1022,7 +1022,7 @@ static char *spandsp_fax_cli_show_session(struct ast_fax_session *s, int fd)
        if (s->details->caps & AST_FAX_TECH_GATEWAY) {
                struct spandsp_pvt *p = s->tech_pvt;
 
-               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", "Gateway");
                ast_cli(fd, "%-22s : %s\n", "state", ast_fax_state_to_str(s->state));
                if (s->state != AST_FAX_STATE_UNINITIALIZED) {
@@ -1033,13 +1033,13 @@ static char *spandsp_fax_cli_show_session(struct ast_fax_session *s, int fd)
                        ast_cli(fd, "%-22s : %d\n", "Page Number", stats.pages_transferred + 1);
                }
        } else if (s->details->caps & AST_FAX_TECH_V21_DETECT) {
-               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", "V.21 Detect");
                ast_cli(fd, "%-22s : %s\n", "state", ast_fax_state_to_str(s->state));
        } else {
                struct spandsp_pvt *p = s->tech_pvt;
 
-               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 aea3eb482e43ec4481231d02d04a0f5c2013cb76..1249f0472377e3a077effc38c990e52a4084d243 100644 (file)
@@ -65,7 +65,7 @@ static void celt_sdp_generate(const struct ast_format_attr *format_attr, unsigne
                return;
        }
 
-       ast_str_append(str, 0, "a=fmtp:%d framesize=%d\r\n", payload, attr->framesize);
+       ast_str_append(str, 0, "a=fmtp:%u framesize=%u\r\n", payload, attr->framesize);
 }
 
 static enum ast_format_cmp_res celt_cmp(const struct ast_format_attr *fattr1, const struct ast_format_attr *fattr2)
@@ -127,7 +127,7 @@ static int celt_isset(const struct ast_format_attr *fattr, va_list ap)
                        }
                        break;
                default:
-                       ast_log(LOG_WARNING, "unknown attribute type %d\n", key);
+                       ast_log(LOG_WARNING, "unknown attribute type %u\n", key);
                        return -1;
                }
        }
@@ -172,7 +172,7 @@ static void celt_set(struct ast_format_attr *fattr, va_list ap)
                        attr->framesize = (va_arg(ap, int));
                        break;
                default:
-                       ast_log(LOG_WARNING, "unknown attribute type %d\n", key);
+                       ast_log(LOG_WARNING, "unknown attribute type %u\n", key);
                }
        }
 }
index 2ca39a92799d0fc62be2358cd31465c24925a8f2..8ec28aac9b6f23942f8c7500533d5f1fe613b187 100644 (file)
@@ -193,7 +193,7 @@ static void h263_format_attr_sdp_generate(const struct ast_format_attr *format_a
                        }
 
                        if (!added) {
-                               ast_str_append(str, 0, "a=fmtp:%d CUSTOM=%u,%u,%u", payload, format_attr->format_attr[H263_ATTR_KEY_CUSTOM_XMAX],
+                               ast_str_append(str, 0, "a=fmtp:%u CUSTOM=%u,%u,%u", payload, format_attr->format_attr[H263_ATTR_KEY_CUSTOM_XMAX],
                                               format_attr->format_attr[H263_ATTR_KEY_CUSTOM_YMAX], format_attr->format_attr[H263_ATTR_KEY_CUSTOM_MPI]);
                                added = 1;
                        } else {
@@ -206,7 +206,7 @@ static void h263_format_attr_sdp_generate(const struct ast_format_attr *format_a
                        }
 
                        if (!added) {
-                               ast_str_append(str, 0, "a=fmtp:%d PAR=%u:%u", payload, format_attr->format_attr[H263_ATTR_KEY_PAR_WIDTH],
+                               ast_str_append(str, 0, "a=fmtp:%u PAR=%u:%u", payload, format_attr->format_attr[H263_ATTR_KEY_PAR_WIDTH],
                                               format_attr->format_attr[H263_ATTR_KEY_PAR_HEIGHT]);
                                added = 1;
                        } else {
@@ -219,7 +219,7 @@ static void h263_format_attr_sdp_generate(const struct ast_format_attr *format_a
                        }
 
                        if (!added) {
-                               ast_str_append(str, 0, "a=fmtp:%d P=%u", payload, format_attr->format_attr[H263_ATTR_KEY_P_SUB1]);
+                               ast_str_append(str, 0, "a=fmtp:%u P=%u", payload, format_attr->format_attr[H263_ATTR_KEY_P_SUB1]);
                                added = 1;
                        } else {
                                ast_str_append(str, 0, ";P=%u", format_attr->format_attr[H263_ATTR_KEY_P_SUB1]);
@@ -237,7 +237,7 @@ static void h263_format_attr_sdp_generate(const struct ast_format_attr *format_a
 
                } else if ((name = h263_attr_key_to_str(i, format_attr))) {
                        if (!added) {
-                               ast_str_append(str, 0, "a=fmtp:%d %s=%u", payload, name, format_attr->format_attr[i]);
+                               ast_str_append(str, 0, "a=fmtp:%u %s=%u", payload, name, format_attr->format_attr[i]);
                                added = 1;
                        } else {
                                ast_str_append(str, 0, ";%s=%u", name, format_attr->format_attr[i]);
index eae1aa36ef5ba687201680b49ce9d579798b9c92..5ecde3f3f9f99cae2bfb6d7e8112529627f23981 100644 (file)
@@ -260,7 +260,7 @@ static void h264_format_attr_sdp_generate(const struct ast_format_attr *format_a
                        ast_base64encode(pps, ppsdecoded, format_attr->format_attr[H264_ATTR_KEY_PPS_LEN], H264_MAX_SPS_PPS_SIZE);
 
                        if (!added) {
-                               ast_str_append(str, 0, "a=fmtp:%d sprop-parameter-sets=%s,%s", payload, sps, pps);
+                               ast_str_append(str, 0, "a=fmtp:%u sprop-parameter-sets=%s,%s", payload, sps, pps);
                                added = 1;
                        } else {
                                ast_str_append(str, 0, ";sprop-parameter-sets=%s,%s", sps, pps);
@@ -268,7 +268,7 @@ static void h264_format_attr_sdp_generate(const struct ast_format_attr *format_a
                } else if (i == H264_ATTR_KEY_PROFILE_IDC && format_attr->format_attr[H264_ATTR_KEY_PROFILE_IDC] &&
                    format_attr->format_attr[H264_ATTR_KEY_PROFILE_IOP] && format_attr->format_attr[H264_ATTR_KEY_LEVEL]) {
                        if (!added) {
-                               ast_str_append(str, 0, "a=fmtp:%d profile-level-id=%X%X%X", payload, format_attr->format_attr[H264_ATTR_KEY_PROFILE_IDC],
+                               ast_str_append(str, 0, "a=fmtp:%u profile-level-id=%X%X%X", payload, format_attr->format_attr[H264_ATTR_KEY_PROFILE_IDC],
                                               format_attr->format_attr[H264_ATTR_KEY_PROFILE_IOP], format_attr->format_attr[H264_ATTR_KEY_LEVEL]);
                                added = 1;
                        } else {
@@ -277,7 +277,7 @@ static void h264_format_attr_sdp_generate(const struct ast_format_attr *format_a
                        }
                } else if ((name = h264_attr_key_to_str(i)) && h264_attr_key_addable(format_attr, i)) {
                        if (!added) {
-                               ast_str_append(str, 0, "a=fmtp:%d %s=%u", payload, name, format_attr->format_attr[i]);
+                               ast_str_append(str, 0, "a=fmtp:%u %s=%u", payload, name, format_attr->format_attr[i]);
                                added = 1;
                        } else {
                                ast_str_append(str, 0, ";%s=%u", name, format_attr->format_attr[i]);
index ed8adb77f9ae06607e21bb3180982c63f8601497..3fa7dcef3dca65f5ce17f3352780ea994e79f03e 100644 (file)
@@ -97,11 +97,11 @@ static void opus_sdp_generate(const struct ast_format_attr *format_attr, unsigne
 
        /* FIXME should we only generate attributes that were explicitly set? */
        ast_str_append(str, 0,
-                               "a=fmtp:%d "
-                                       "maxplaybackrate=%d;"
-                                       "sprop-maxcapturerate=%d;"
-                                       "minptime=%d;"
-                                       "maxaveragebitrate=%d;"
+                               "a=fmtp:%u "
+                                       "maxplaybackrate=%u;"
+                                       "sprop-maxcapturerate=%u;"
+                                       "minptime=%u;"
+                                       "maxaveragebitrate=%u;"
                                        "stereo=%d;"
                                        "sprop-stereo=%d;"
                                        "cbr=%d;"
@@ -216,7 +216,7 @@ static int opus_isset(const struct ast_format_attr *fattr, va_list ap)
                        }
                        break;
                default:
-                       ast_log(LOG_WARNING, "unknown attribute type %d\n", key);
+                       ast_log(LOG_WARNING, "unknown attribute type %u\n", key);
                        return -1;
                }
        }
@@ -284,7 +284,7 @@ static void opus_set(struct ast_format_attr *fattr, va_list ap)
                        attr->spropstereo = (va_arg(ap, int));
                        break;
                default:
-                       ast_log(LOG_WARNING, "unknown attribute type %d\n", key);
+                       ast_log(LOG_WARNING, "unknown attribute type %u\n", key);
                }
        }
 }
index 7d4fa5bf844813328c7ef66f31330db6a785cc0b..075570fb52737b8e07c2f98fd42d54bd4a566bd1 100644 (file)
@@ -70,11 +70,11 @@ static void silk_sdp_generate(const struct ast_format_attr *format_attr, unsigne
        struct silk_attr *attr = (struct silk_attr *) format_attr;
 
        if ((attr->maxbitrate > 5000) && (attr->maxbitrate < 40000)) { 
-               ast_str_append(str, 0, "a=fmtp:%d maxaveragebitrate=%d\r\n", payload, attr->maxbitrate);
+               ast_str_append(str, 0, "a=fmtp:%u maxaveragebitrate=%u\r\n", payload, attr->maxbitrate);
        }
 
-       ast_str_append(str, 0, "a=fmtp:%d usedtx=%d\r\n", payload, attr->dtx);
-       ast_str_append(str, 0, "a=fmtp:%d useinbandfec=%d\r\n", payload, attr->fec);
+       ast_str_append(str, 0, "a=fmtp:%u usedtx=%u\r\n", payload, attr->dtx);
+       ast_str_append(str, 0, "a=fmtp:%u useinbandfec=%u\r\n", payload, attr->fec);
 }
 
 static enum ast_format_cmp_res silk_cmp(const struct ast_format_attr *fattr1, const struct ast_format_attr *fattr2)
@@ -152,7 +152,7 @@ static int silk_isset(const struct ast_format_attr *fattr, va_list ap)
                        }
                        break;
                default:
-                       ast_log(LOG_WARNING, "unknown attribute type %d\n", key);
+                       ast_log(LOG_WARNING, "unknown attribute type %u\n", key);
                        return -1;
                }
        }
@@ -213,7 +213,7 @@ static void silk_set(struct ast_format_attr *fattr, va_list ap)
                        attr->packetloss_percentage = (va_arg(ap, int));
                        break;
                default:
-                       ast_log(LOG_WARNING, "unknown attribute type %d\n", key);
+                       ast_log(LOG_WARNING, "unknown attribute type %u\n", key);
                }
        }
 }
index d344340c75ac85d6ff84cf35b7d7b6d923f03a1c..cdb639f485ac60e95e78f57f29d98ca1c960d90c 100644 (file)
@@ -483,7 +483,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_read)(struct ast_websocket *session, cha
                *payload = &buf[frame_size]; /* payload will start here, at the end of the options, if any */
                frame_size = frame_size + (*payload_len); /* final frame size is header + optional headers + payload data */
                if (frame_size > MAXIMUM_FRAME_SIZE) {
-                       ast_log(LOG_WARNING, "Cannot fit huge websocket frame of %zd bytes\n", frame_size);
+                       ast_log(LOG_WARNING, "Cannot fit huge websocket frame of %zu bytes\n", frame_size);
                        /* The frame won't fit :-( */
                        ast_websocket_close(session, 1009);
                        return -1;
@@ -502,7 +502,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_read)(struct ast_websocket *session, cha
                }
 
                if (!(new_payload = ast_realloc(session->payload, (session->payload_len + *payload_len)))) {
-                       ast_log(LOG_WARNING, "Failed allocation: %p, %zd, %"PRIu64"\n",
+                       ast_log(LOG_WARNING, "Failed allocation: %p, %zu, %"PRIu64"\n",
                                session->payload, session->payload_len, *payload_len);
                        *payload_len = 0;
                        ast_websocket_close(session, 1009);
@@ -554,7 +554,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_read)(struct ast_websocket *session, cha
 
                session->closing = 1;
        } else {
-               ast_log(LOG_WARNING, "WebSocket unknown opcode %d\n", *opcode);
+               ast_log(LOG_WARNING, "WebSocket unknown opcode %u\n", *opcode);
                /* We received an opcode that we don't understand, the RFC states that 1003 is for a type of data that can't be accepted... opcodes
                 * fit that, I think. */
                ast_websocket_close(session, 1003);
@@ -799,7 +799,7 @@ static void websocket_echo_callback(struct ast_websocket *session, struct ast_va
                } else if (opcode == AST_WEBSOCKET_OPCODE_CLOSE) {
                        break;
                } else {
-                       ast_debug(1, "Ignored WebSocket opcode %d\n", opcode);
+                       ast_debug(1, "Ignored WebSocket opcode %u\n", opcode);
                }
        }
 
index ede498124ce0da432634acd3e0f449857112639a..dbc6135f33da8a429eb92a2343854dab1ebbc962 100644 (file)
@@ -1811,7 +1811,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;
        }
 
@@ -2539,35 +2539,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) {
@@ -2578,7 +2578,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);
        }
 }
@@ -3344,7 +3344,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");
                ast_publish_device_state_full(item_id,
index b5225010e2de14b34241109e4c530c4c5e2dfe08..986e23dd874ac7f4be23ba872ab760174ec757ff 100644 (file)
@@ -329,9 +329,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 5bc63471cf91bd029045d2aa6a0e92ee3e38eca4..1bb591174b6a3f96e54e76b681c4bf9f8fe51efe 100644 (file)
@@ -239,7 +239,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 6a9c456528d370d99fe7c3e025cb4286f4799cc5..2307c2876e5c9510eaed053516720485e7ceebe1 100644 (file)
@@ -995,7 +995,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))) {
                                        ao2_lock(current);
index 146a02d59bc0e5901360bf70d6f54f601a674762..b0a49cdf770c6ca3dac7c6553dddefa0b8a5db83 100644 (file)
@@ -229,7 +229,7 @@ static int expiration_str2struct(const struct aco_option *opt, struct ast_variab
 static int expiration_struct2str(const void *obj, const intptr_t *args, char **buf)
 {
        const struct ast_sip_contact *contact = obj;
-       return (ast_asprintf(buf, "%lu", contact->expiration_time.tv_sec) < 0) ? -1 : 0;
+       return (ast_asprintf(buf, "%ld", contact->expiration_time.tv_sec) < 0) ? -1 : 0;
 }
 
 /*! \brief Helper function which validates a permanent contact */
@@ -765,7 +765,7 @@ static int cli_aor_print_body(void *obj, void *arg, int flags)
        indent = CLI_INDENT_TO_SPACES(context->indent_level);
        flexwidth = CLI_LAST_TABSTOP - indent - 12;
 
-       ast_str_append(&context->output_buffer, 0, "%*s:  %-*.*s %12d\n",
+       ast_str_append(&context->output_buffer, 0, "%*s:  %-*.*s %12u\n",
                indent,
                "Aor",
                flexwidth, flexwidth,
index 560308693a03d5c9613bc4a7ef5261deb6a8d089..a526f5128fdcc1c5a50530b82e4c47c4481fe2c1 100644 (file)
@@ -675,7 +675,7 @@ static int dtlsrekey_to_str(const void *obj, const intptr_t *args, char **buf)
        const struct ast_sip_endpoint *endpoint = obj;
 
        return ast_asprintf(
-               buf, "%d", endpoint->media.rtp.dtls_cfg.rekey) >=0 ? 0 : -1;
+               buf, "%u", endpoint->media.rtp.dtls_cfg.rekey) >=0 ? 0 : -1;
 }
 
 static int dtlscertfile_to_str(const void *obj, const intptr_t *args, char **buf)
@@ -792,7 +792,7 @@ static int tos_audio_to_str(const void *obj, const intptr_t *args, char **buf)
 {
        const struct ast_sip_endpoint *endpoint = obj;
 
-       if (ast_asprintf(buf, "%d", endpoint->media.tos_audio) == -1) {
+       if (ast_asprintf(buf, "%u", endpoint->media.tos_audio) == -1) {
                return -1;
        }
        return 0;
@@ -802,7 +802,7 @@ static int tos_video_to_str(const void *obj, const intptr_t *args, char **buf)
 {
        const struct ast_sip_endpoint *endpoint = obj;
 
-       if (ast_asprintf(buf, "%d", endpoint->media.tos_video) == -1) {
+       if (ast_asprintf(buf, "%u", endpoint->media.tos_video) == -1) {
                return -1;
        }
        return 0;
index 587fe6daf32ae05f4b0079d8f56a841523541934..09750ef8096f6209cf80ddb3def8063af5de21e3 100644 (file)
@@ -282,7 +282,7 @@ static int handle_client_registration(void *data)
        pjsip_regc_get_info(client_state->client, &info);
        ast_copy_pj_str(server_uri, &info.server_uri, sizeof(server_uri));
        ast_copy_pj_str(client_uri, &info.client_uri, sizeof(client_uri));
-       ast_debug(3, "REGISTER attempt %d to '%s' with client '%s'\n",
+       ast_debug(3, "REGISTER attempt %u to '%s' with client '%s'\n",
                  client_state->retries + 1, server_uri, client_uri);
 
        if (client_state->support_path) {
@@ -431,11 +431,11 @@ static void schedule_retry(struct registration_response *response, unsigned int
 
        if (response->rdata) {
                ast_log(LOG_WARNING, "Temporal response '%d' received from '%s' on "
-                       "registration attempt to '%s', retrying in '%d'\n",
+                       "registration attempt to '%s', retrying in '%u'\n",
                        response->code, server_uri, client_uri, interval);
        } else {
                ast_log(LOG_WARNING, "No response received from '%s' on "
-                       "registration attempt to '%s', retrying in '%d'\n",
+                       "registration attempt to '%s', retrying in '%u'\n",
                        server_uri, client_uri, interval);
        }
 }
@@ -496,7 +496,7 @@ static int handle_registration_response(void *data)
                        response->client_state->status = SIP_REGISTRATION_REJECTED_TEMPORARY;
                        response->client_state->retries++;
                        schedule_registration(response->client_state, response->client_state->forbidden_retry_interval);
-                       ast_log(LOG_WARNING, "403 Forbidden fatal response received from '%s' on registration attempt to '%s', retrying in '%d' seconds\n",
+                       ast_log(LOG_WARNING, "403 Forbidden fatal response received from '%s' on registration attempt to '%s', retrying in '%u' seconds\n",
                                server_uri, client_uri, response->client_state->forbidden_retry_interval);
                } else {
                        /* Finally if there's no hope of registering give up */
index c8c75c694328551525389313f624309556064034..93ed744cf0aeec39ea84585e8c59a602b19647eb 100644 (file)
@@ -778,7 +778,7 @@ static pj_bool_t pubsub_on_rx_subscribe_request(pjsip_rx_data *rdata)
        expires_header = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_EXPIRES, rdata->msg_info.msg->hdr.next);
 
        if (expires_header && expires_header->ivalue < endpoint->subscription.minexpiry) {
-               ast_log(LOG_WARNING, "Subscription expiration %d is too brief for endpoint %s. Minimum is %d\n",
+               ast_log(LOG_WARNING, "Subscription expiration %d is too brief for endpoint %s. Minimum is %u\n",
                                expires_header->ivalue, ast_sorcery_object_get_id(endpoint), endpoint->subscription.minexpiry);
                pjsip_endpt_respond_stateless(ast_sip_get_pjsip_endpoint(), rdata, 423, NULL, NULL, NULL);
                return PJ_TRUE;
index adfa40844a32c39e319ee55bb02be34fcc6e4388..962895b6086593400a8e7b3603f3f9d4f823143e 100644 (file)
@@ -452,7 +452,7 @@ static int rx_task(void *data)
                /* Enforce the maximum number of contacts */
                pjsip_endpt_respond_stateless(ast_sip_get_pjsip_endpoint(), task_data->rdata, 403, NULL, NULL, NULL);
                ast_sip_report_failed_acl(task_data->endpoint, task_data->rdata, "registrar_attempt_exceeds_maximum_configured_contacts");
-               ast_log(LOG_WARNING, "Registration attempt from endpoint '%s' to AOR '%s' will exceed max contacts of %d\n",
+               ast_log(LOG_WARNING, "Registration attempt from endpoint '%s' to AOR '%s' will exceed max contacts of %u\n",
                                ast_sorcery_object_get_id(task_data->endpoint), ast_sorcery_object_get_id(task_data->aor), task_data->aor->max_contacts);
                return PJ_TRUE;
        }
index 1bb36ca1d94e9078467fdb2c7866eea29b977135..5a6935250ea226d2443808899a8d066c976982f6 100644 (file)
@@ -131,7 +131,7 @@ static void t38_change_state(struct ast_sip_session *session, struct ast_sip_ses
        }
 
        session->t38state = new_state;
-       ast_debug(2, "T.38 state changed to '%d' from '%d' on channel '%s'\n", new_state, old_state, ast_channel_name(session->channel));
+       ast_debug(2, "T.38 state changed to '%u' from '%u' on channel '%s'\n", new_state, old_state, ast_channel_name(session->channel));
 
        if (pj_timer_heap_cancel(pjsip_endpt_get_timer_heap(ast_sip_get_pjsip_endpoint()), &state->timer)) {
                ast_debug(2, "Automatic T.38 rejection on channel '%s' terminated\n", ast_channel_name(session->channel));
@@ -695,10 +695,10 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as
        media->desc.port_count = 1;
        media->desc.fmt[media->desc.fmt_count++] = STR_T38;
 
-       snprintf(tmp, sizeof(tmp), "%d", state->our_parms.version);
+       snprintf(tmp, sizeof(tmp), "%u", state->our_parms.version);
        media->attr[media->attr_count++] = pjmedia_sdp_attr_create(pool, "T38FaxVersion", pj_cstr(&stmp, tmp));
 
-       snprintf(tmp, sizeof(tmp), "%d", t38_get_rate(state->our_parms.rate));
+       snprintf(tmp, sizeof(tmp), "%u", t38_get_rate(state->our_parms.rate));
        media->attr[media->attr_count++] = pjmedia_sdp_attr_create(pool, "T38MaxBitRate", pj_cstr(&stmp, tmp));
 
        if (state->our_parms.fill_bit_removal) {
@@ -722,7 +722,7 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as
                break;
        }
 
-       snprintf(tmp, sizeof(tmp), "%d", ast_udptl_get_local_max_datagram(session_media->udptl));
+       snprintf(tmp, sizeof(tmp), "%u", ast_udptl_get_local_max_datagram(session_media->udptl));
        media->attr[media->attr_count++] = pjmedia_sdp_attr_create(pool, "T38FaxMaxDatagram", pj_cstr(&stmp, tmp));
 
        switch (ast_udptl_get_error_correction_scheme(session_media->udptl)) {
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 444b9f7c5469bf604f4cee68083af9284d018e1f..6f2287c9bd8548f4ca128a8f4b5d79bfd2152c4b 100644 (file)
@@ -766,7 +766,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", (long unsigned)val[0], (long unsigned)val[1], (long unsigned)val[2], (long unsigned)val[3]);
 
         return buf;
 }
@@ -862,7 +862,7 @@ static int ast_rtp_dtls_set_configuration(struct ast_rtp_instance *instance, con
                }
 
                for (i = 0; i < size; i++) {
-                       sprintf(local_fingerprint, "%.2X:", fingerprint[i]);
+                       sprintf(local_fingerprint, "%.2X:", (unsigned)fingerprint[i]);
                        local_fingerprint += 3;
                }
 
@@ -1483,7 +1483,7 @@ static int dtls_srtp_setup(struct ast_rtp *rtp, struct ast_srtp *srtp, struct as
        }
 
        if (res_srtp_policy->set_suite(local_policy, rtp->suite)) {
-               ast_log(LOG_WARNING, "Could not set suite to '%d' on local policy of '%p' when setting up DTLS-SRTP\n", rtp->suite, rtp);
+               ast_log(LOG_WARNING, "Could not set suite to '%u' on local policy of '%p' when setting up DTLS-SRTP\n", rtp->suite, rtp);
                goto error;
        }
 
@@ -1503,7 +1503,7 @@ static int dtls_srtp_setup(struct ast_rtp *rtp, struct ast_srtp *srtp, struct as
        }
 
        if (res_srtp_policy->set_suite(remote_policy, rtp->suite)) {
-               ast_log(LOG_WARNING, "Could not set suite to '%d' on remote policy of '%p' when setting up DTLS-SRTP\n", rtp->suite, rtp);
+               ast_log(LOG_WARNING, "Could not set suite to '%u' on remote policy of '%p' when setting up DTLS-SRTP\n", rtp->suite, rtp);
                goto error;
        }
 
@@ -2185,7 +2185,7 @@ static int ast_rtp_dtmf_begin(struct ast_rtp_instance *instance, char digit)
                }
                update_address_with_ice_candidate(rtp, AST_RTP_ICE_COMPONENT_RTP, &remote_address);
                if (rtp_debug_test_addr(&remote_address)) {
-                       ast_verbose("Sent RTP DTMF packet to %s%s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+                       ast_verbose("Sent RTP DTMF packet to %s%s (type %-2.2d, seq %-6.6d, ts %-6.6u, len %-6.6d)\n",
                                    ast_sockaddr_stringify(&remote_address),
                                    ice ? " (via ICE)" : "",
                                    payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
@@ -2236,7 +2236,7 @@ static int ast_rtp_dtmf_continuation(struct ast_rtp_instance *instance)
        update_address_with_ice_candidate(rtp, AST_RTP_ICE_COMPONENT_RTP, &remote_address);
 
        if (rtp_debug_test_addr(&remote_address)) {
-               ast_verbose("Sent RTP DTMF packet to %s%s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+               ast_verbose("Sent RTP DTMF packet to %s%s (type %-2.2d, seq %-6.6d, ts %-6.6u, len %-6.6d)\n",
                            ast_sockaddr_stringify(&remote_address),
                            ice ? " (via ICE)" : "",
                            rtp->send_payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
@@ -2285,7 +2285,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.format) / 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;
        }
 
@@ -2312,7 +2312,7 @@ static int ast_rtp_dtmf_end_with_duration(struct ast_rtp_instance *instance, cha
                update_address_with_ice_candidate(rtp, AST_RTP_ICE_COMPONENT_RTP, &remote_address);
 
                if (rtp_debug_test_addr(&remote_address)) {
-                       ast_verbose("Sent RTP DTMF packet to %s%s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+                       ast_verbose("Sent RTP DTMF packet to %s%s (type %-2.2d, seq %-6.6d, ts %-6.6u, len %-6.6d)\n",
                                    ast_sockaddr_stringify(&remote_address),
                                    ice ? " (via ICE)" : "",
                                    rtp->send_payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
@@ -2576,7 +2576,7 @@ static int ast_rtcp_write_report(struct ast_rtp_instance *instance, int sr)
                }
                ast_verbose("  Report block:\n");
                ast_verbose("    Their SSRC: %u\n", report_block->source_ssrc);
-               ast_verbose("    Fraction lost: %u\n", report_block->lost_count.fraction);
+               ast_verbose("    Fraction lost: %d\n", report_block->lost_count.fraction);
                ast_verbose("    Cumulative loss: %u\n", report_block->lost_count.packets);
                ast_verbose("    Highest seq no: %u\n", report_block->highest_seq_no);
                ast_verbose("    IA jitter: %.4f\n", (double)report_block->ia_jitter / rate);
@@ -2652,7 +2652,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;
                        }
                }
@@ -2667,7 +2667,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;
                        }
                }
@@ -2681,7 +2681,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;
                        }
                }
@@ -2744,7 +2744,7 @@ static int ast_rtp_raw_write(struct ast_rtp_instance *instance, struct ast_frame
                update_address_with_ice_candidate(rtp, AST_RTP_ICE_COMPONENT_RTP, &remote_address);
 
                if (rtp_debug_test_addr(&remote_address)) {
-                       ast_verbose("Sent RTP packet to      %s%s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+                       ast_verbose("Sent RTP packet to      %s%s (type %-2.2d, seq %-6.6d, ts %-6.6u, len %-6.6d)\n",
                                    ast_sockaddr_stringify(&remote_address),
                                    ice ? " (via ICE)" : "",
                                    codec, rtp->seqno, rtp->lastts, res - hdrlen);
@@ -3061,7 +3061,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);
        }
@@ -3122,7 +3122,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 duplicate or out of order DTMF END frame (seqno: %d, ts %d, digit %c)\n",
+                               ast_debug(1, "Dropping duplicate or out of order DTMF END frame (seqno: %u, ts %u, digit %c)\n",
                                        seqno, timestamp, resp);
                        }
                } else {
@@ -3139,7 +3139,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;
@@ -3224,7 +3224,7 @@ static struct ast_frame *process_dtmf_cisco(struct ast_rtp_instance *instance, u
        event = data[3] & 0x1f;
 
        if (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) {
@@ -3560,8 +3560,8 @@ static struct ast_frame *ast_rtcp_read(struct ast_rtp_instance *instance)
                                timeval2ntp(now, &msw, &lsw);
                                lsr_now = (((msw & 0xffff) << 16) | ((lsw & 0xffff0000) >> 16));
                                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",
                                                report_block->lsr, lsr_now, report_block->dlsr, report_block->dlsr / 65536,
                                                (report_block->dlsr % 65536) * 1000 / 65536,
                                                report_block->dlsr - (lsr_now - report_block->lsr));
@@ -3571,7 +3571,7 @@ static struct ast_frame *ast_rtcp_read(struct ast_rtp_instance *instance)
                        rtp->rtcp->reported_jitter_count++;
 
                        if (rtcp_debug_test_addr(&addr)) {
-                       ast_verbose("  Fraction lost: %u\n", report_block->lost_count.fraction);
+                       ast_verbose("  Fraction lost: %d\n", report_block->lost_count.fraction);
                                ast_verbose("  Packets lost so far: %u\n", report_block->lost_count.packets);
                                ast_verbose("  Highest sequence number: %u\n", report_block->highest_seq_no & 0x0000ffff);
                                ast_verbose("  Sequence number cycles: %u\n", report_block->highest_seq_no >> 16);
@@ -3705,7 +3705,7 @@ static int bridge_p2p_rtp_write(struct ast_rtp_instance *instance, unsigned int
        update_address_with_ice_candidate(rtp, AST_RTP_ICE_COMPONENT_RTP, &remote_address);
 
        if (rtp_debug_test_addr(&remote_address)) {
-               ast_verbose("Sent RTP P2P packet to %s%s (type %-2.2d, len %-6.6u)\n",
+               ast_verbose("Sent RTP P2P packet to %s%s (type %-2.2d, len %-6.6d)\n",
                            ast_sockaddr_stringify(&remote_address),
                            ice ? " (via ICE)" : "",
                            bridged_payload, len - hdrlen);
@@ -3914,7 +3914,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");
@@ -3955,7 +3955,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);
        }
@@ -4448,7 +4448,7 @@ static int ast_rtp_sendcng(struct ast_rtp_instance *instance, int level)
        update_address_with_ice_candidate(rtp, AST_RTP_ICE_COMPONENT_RTP, &remote_address);
 
        if (rtp_debug_test_addr(&remote_address)) {
-               ast_verbose("Sent Comfort Noise RTP packet to %s%s (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
+               ast_verbose("Sent Comfort Noise RTP packet to %s%s (type %-2.2d, seq %-6.6d, ts %-6.6u, len %-6.6d)\n",
                            ast_sockaddr_stringify(&remote_address),
                            ice ? " (via ICE)" : "",
                            AST_RTP_CN, rtp->seqno, rtp->lastdigitts, res - hdrlen);
index 608413226b6c526876dcec0ffc9ee3e000abe2c2..426782d13f422b81f988ab560d606242be0cb057 100644 (file)
@@ -320,7 +320,7 @@ static void *sorcery_config_open(const char *data)
                char *name = strsep(&option, "="), *value = option;
 
                if (!strcasecmp(name, "buckets")) {
-                       if (sscanf(value, "%30d", &config->buckets) != 1) {
+                       if (sscanf(value, "%30u", &config->buckets) != 1) {
                                ast_log(LOG_ERROR, "Unsupported bucket size of '%s' used for configuration file '%s', defaulting to '%d'\n",
                                        value, filename, DEFAULT_OBJECT_BUCKETS);
                        }
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 b434dca6349923f9caedf11a9b66dfcdda2ebf74..67d4efc63ed69d0b4356fc1e72a781fd5ca876d0 100644 (file)
@@ -632,7 +632,7 @@ enum stasis_playback_oper_results stasis_app_playback_operation(
        ast_assert(playback->state >= 0 && playback->state < STASIS_PLAYBACK_STATE_MAX);
 
        if (operation < 0 || operation >= STASIS_PLAYBACK_MEDIA_OP_MAX) {
-               ast_log(LOG_ERROR, "Invalid playback operation %d\n", operation);
+               ast_log(LOG_ERROR, "Invalid playback operation %u\n", operation);
                return -1;
        }
 
@@ -646,7 +646,7 @@ enum stasis_playback_oper_results stasis_app_playback_operation(
                        /* And, really, all operations should be valid during
                         * playback */
                        ast_log(LOG_ERROR,
-                               "Unhandled operation during playback: %d\n",
+                               "Unhandled operation during playback: %u\n",
                                operation);
                        return STASIS_PLAYBACK_OPER_FAILED;
                }
index a256fe99949485251d7ffc3502e684f814753a47..55954cd1ee5b5c70aaa6bd1fb7ef02b76af1692d 100644 (file)
@@ -576,13 +576,13 @@ enum stasis_app_recording_oper_results stasis_app_recording_operation(
        SCOPED_AO2LOCK(lock, recording);
 
        if (recording->state < 0 || recording->state >= STASIS_APP_RECORDING_STATE_MAX) {
-               ast_log(LOG_WARNING, "Invalid recording state %d\n",
+               ast_log(LOG_WARNING, "Invalid recording state %u\n",
                        recording->state);
                return -1;
        }
 
        if (operation < 0 || operation >= STASIS_APP_RECORDING_OPER_MAX) {
-               ast_log(LOG_WARNING, "Invalid recording operation %d\n",
+               ast_log(LOG_WARNING, "Invalid recording operation %u\n",
                        operation);
                return -1;
        }
@@ -597,7 +597,7 @@ enum stasis_app_recording_oper_results stasis_app_recording_operation(
                        /* And, really, all operations should be valid during
                         * recording */
                        ast_log(LOG_ERROR,
-                               "Unhandled operation during recording: %d\n",
+                               "Unhandled operation during recording: %u\n",
                                operation);
                        return STASIS_APP_RECORDING_OPER_FAILED;
                }
index 169e02b7533471bd781897c89e4eda331176ee74..e4a309d472c9cc9218e4f007fcf0b55714bb07c3 100644 (file)
@@ -327,7 +327,7 @@ struct ast_channel *stasis_app_control_snoop(struct ast_channel *chan,
 
        /* Allocate a Snoop channel and set up various parameters */
        snoop->chan = ast_channel_alloc(1, AST_STATE_UP, "", "", "", "", "", &assignedids, NULL, 0, "Snoop/%s-%08x", ast_channel_uniqueid(chan),
-               ast_atomic_fetchadd_int((int *)&chan_idx, +1));
+               (unsigned)ast_atomic_fetchadd_int((int *)&chan_idx, +1));
        if (!snoop->chan) {
                return NULL;
        }
index 42ba106e33b478e5c4f36f959a102398be0b969f..c621c014decb55b81871f8ab0ddac28dfafd7fae 100644 (file)
@@ -370,7 +370,7 @@ static void _stun_show_status(int fd)
 {
        const char *status;
 
-#define DATALN "%-25s %-5d %-7d %-8d %-7s %-16s %-d\n"
+#define DATALN "%-25s %-5u %-7u %-8d %-7s %-16s %-d\n"
 #define HEADER "%-25s %-5s %-7s %-8s %-7s %-16s %-s\n"
 
        /*! we only have one stun server, but start to play well with more */
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",
index fcdd2c4a8af41a81edaf11513f2e7d7b5b931f5f..0cfc37b4ca4a6e5ec239133c4015c7c5d260594d 100644 (file)
@@ -1463,7 +1463,7 @@ static int xmpp_pubsub_handle_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");
                ast_publish_device_state_full(item_id,
@@ -3374,7 +3374,7 @@ static int xmpp_pak_presence(struct ast_xmpp_client *client, struct ast_xmpp_cli
                }
 
                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);
        }