Index: acl.c =================================================================== RCS file: /usr/cvsroot/asterisk/acl.c,v retrieving revision 1.41 diff -u -r1.41 acl.c --- acl.c 22 Apr 2005 13:11:34 -0000 1.41 +++ acl.c 29 Apr 2005 01:13:32 -0000 @@ -150,7 +150,7 @@ nm++; } if (!strchr(nm, '.')) { - if ((sscanf(nm, "%i", &x) == 1) && (x >= 0) && (x <= 32)) { + if ((sscanf(nm, "%d", &x) == 1) && (x >= 0) && (x <= 32)) { y = 0; for (z=0;z>= 1; Index: apps/app_osplookup.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_osplookup.c,v retrieving revision 1.6 diff -u -r1.6 app_osplookup.c --- apps/app_osplookup.c 21 Apr 2005 06:02:43 -0000 1.6 +++ apps/app_osplookup.c 29 Apr 2005 01:25:14 -0000 @@ -150,7 +150,7 @@ cause = str2cause((char *)data); temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE"); result.handle = -1; - if (temp && strlen(temp) && (sscanf(temp, "%i", &result.handle) == 1) && (result.handle > -1)) { + if (temp && strlen(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) { if ((res = ast_osp_next(&result, cause)) > 0) { char tmp[80]; snprintf(tmp, sizeof(tmp), "%d", result.handle); @@ -203,7 +203,7 @@ cause = str2cause((char *)data); temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE"); result.handle = -1; - if (temp && strlen(temp) && (sscanf(temp, "%i", &result.handle) == 1) && (result.handle > -1)) { + if (temp && strlen(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) { if (!ast_osp_terminate(result.handle, cause, start, duration)) { pbx_builtin_setvar_helper(chan, "_OSPHANDLE", ""); res = 1; Index: apps/app_voicemail.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v retrieving revision 1.208 diff -u -r1.208 app_voicemail.c --- apps/app_voicemail.c 27 Apr 2005 01:37:46 -0000 1.208 +++ apps/app_voicemail.c 29 Apr 2005 01:20:23 -0000 @@ -859,7 +859,7 @@ SQLFreeHandle (SQL_HANDLE_STMT, stmt); goto yuck; } - if (sscanf(rowdata, "%i", &x) != 1) + if (sscanf(rowdata, "%d", &x) != 1) ast_log(LOG_WARNING, "Failed to read message count!\n"); SQLFreeHandle (SQL_HANDLE_STMT, stmt); } else @@ -920,7 +920,7 @@ SQLFreeHandle (SQL_HANDLE_STMT, stmt); goto yuck; } - if (sscanf(rowdata, "%i", &x) != 1) + if (sscanf(rowdata, "%d", &x) != 1) ast_log(LOG_WARNING, "Failed to read message count!\n"); SQLFreeHandle (SQL_HANDLE_STMT, stmt); } else @@ -4072,7 +4072,7 @@ vm_change_password(vmu,newpassword); else vm_change_password_shell(vmu,newpassword); - ast_log(LOG_DEBUG,"User %s set password to %s of length %i\n",vms->username,newpassword,(int)strlen(newpassword)); + ast_log(LOG_DEBUG,"User %s set password to %s of length %d\n",vms->username,newpassword,(int)strlen(newpassword)); cmd = ast_play_and_wait(chan,"vm-passchanged"); /* If forcename is set, have the user record their name */ @@ -4174,7 +4174,7 @@ vm_change_password(vmu,newpassword); else vm_change_password_shell(vmu,newpassword); - ast_log(LOG_DEBUG,"User %s set password to %s of length %i\n",vms->username,newpassword,(int)strlen(newpassword)); + ast_log(LOG_DEBUG,"User %s set password to %s of length %d\n",vms->username,newpassword,(int)strlen(newpassword)); cmd = ast_play_and_wait(chan,"vm-passchanged"); break; case '*': Index: channels/chan_mgcp.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v retrieving revision 1.116 diff -u -r1.116 chan_mgcp.c --- channels/chan_mgcp.c 21 Apr 2005 06:02:43 -0000 1.116 +++ channels/chan_mgcp.c 29 Apr 2005 01:54:24 -0000 @@ -4132,7 +4132,7 @@ else capability &= ~format; } else if (!strcasecmp(v->name, "tos")) { - if (sscanf(v->value, "%i", &format) == 1) + if (sscanf(v->value, "%d", &format) == 1) tos = format & 0xff; else if (!strcasecmp(v->value, "lowdelay")) tos = IPTOS_LOWDELAY; @@ -4147,7 +4147,7 @@ else ast_log(LOG_WARNING, "Invalid tos value at line %d, should be 'lowdelay', 'throughput', 'reliability', 'mincost', or 'none'\n", v->lineno); } else if (!strcasecmp(v->name, "port")) { - if (sscanf(v->value, "%i", &ourport) == 1) { + if (sscanf(v->value, "%d", &ourport) == 1) { bindaddr.sin_port = htons(ourport); } else { ast_log(LOG_WARNING, "Invalid port number '%s' at line %d of %s\n", v->value, v->lineno, config); Index: channel.c =================================================================== RCS file: /usr/cvsroot/asterisk/channel.c,v retrieving revision 1.192 diff -u -r1.192 channel.c --- channel.c 24 Apr 2005 22:54:50 -0000 1.192 +++ channel.c 29 Apr 2005 01:49:06 -0000 @@ -854,7 +854,7 @@ manager_event(EVENT_FLAG_CALL, "Hangup", "Channel: %s\r\n" "Uniqueid: %s\r\n" - "Cause: %i\r\n", + "Cause: %d\r\n", chan->name, chan->uniqueid, chan->hangupcause); ast_channel_free(chan); return res; Index: pbx.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx.c,v retrieving revision 1.232 diff -u -r1.232 pbx.c --- pbx.c 29 Apr 2005 15:04:25 -0000 1.232 +++ pbx.c 29 Apr 2005 16:12:38 -0000 @@ -1057,7 +1057,7 @@ snprintf(workspace, workspacelen, "%s", c->uniqueid); *ret = workspace; } else if (c && !strcmp(var, "HANGUPCAUSE")) { - snprintf(workspace, workspacelen, "%i", c->hangupcause); + snprintf(workspace, workspacelen, "%d", c->hangupcause); *ret = workspace; } else if (c && !strcmp(var, "ACCOUNTCODE")) { strncpy(workspace, c->accountcode, workspacelen - 1); @@ -5261,7 +5261,7 @@ struct ast_frame *f; int waittime; - if (!data || !strlen(data) || (sscanf(data, "%i", &waittime) != 1) || (waittime < 0)) + if (!data || !strlen(data) || (sscanf(data, "%d", &waittime) != 1) || (waittime < 0)) waittime = -1; if (waittime > -1) { ast_safe_sleep(chan, waittime * 1000); Index: res/res_osp.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_osp.c,v retrieving revision 1.13 diff -u -r1.13 res_osp.c --- res/res_osp.c 21 Apr 2005 06:02:44 -0000 1.13 +++ res/res_osp.c 29 Apr 2005 01:35:07 -0000 @@ -151,22 +151,22 @@ } else ast_log(LOG_WARNING, "Too many Service points at line %d\n", v->lineno); } else if (!strcasecmp(v->name, "maxconnections")) { - if ((sscanf(v->value, "%i", &x) == 1) && (x > 0) && (x <= 1000)) { + if ((sscanf(v->value, "%d", &x) == 1) && (x > 0) && (x <= 1000)) { osp->maxconnections = x; } else ast_log(LOG_WARNING, "maxconnections should be an integer from 1 to 1000, not '%s' at line %d\n", v->value, v->lineno); } else if (!strcasecmp(v->name, "retrydelay")) { - if ((sscanf(v->value, "%i", &x) == 1) && (x >= 0) && (x <= 10)) { + if ((sscanf(v->value, "%d", &x) == 1) && (x >= 0) && (x <= 10)) { osp->retrydelay = x; } else ast_log(LOG_WARNING, "retrydelay should be an integer from 0 to 10, not '%s' at line %d\n", v->value, v->lineno); } else if (!strcasecmp(v->name, "retrylimit")) { - if ((sscanf(v->value, "%i", &x) == 1) && (x >= 0) && (x <= 100)) { + if ((sscanf(v->value, "%d", &x) == 1) && (x >= 0) && (x <= 100)) { osp->retrylimit = x; } else ast_log(LOG_WARNING, "retrylimit should be an integer from 0 to 100, not '%s' at line %d\n", v->value, v->lineno); } else if (!strcasecmp(v->name, "timeout")) { - if ((sscanf(v->value, "%i", &x) == 1) && (x >= 200) && (x <= 10000)) { + if ((sscanf(v->value, "%d", &x) == 1) && (x >= 200) && (x <= 10000)) { osp->timeout = x; } else ast_log(LOG_WARNING, "timeout should be an integer from 200 to 10000, not '%s' at line %d\n", v->value, v->lineno); Index: app.c =================================================================== RCS file: /usr/cvsroot/asterisk/app.c,v retrieving revision 1.57 diff -u -r1.57 app.c --- app.c 22 Apr 2005 13:11:34 -0000 1.57 +++ app.c 29 Apr 2005 01:14:59 -0000 @@ -571,7 +571,7 @@ end=start; /* pre-initialize end to be same as start in case we never get into loop */ for (x=0;x255)) { maxdigits = 255; } else if (option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_3 "Accepting a maximum of %i digits.\n", maxdigits); + ast_verbose(VERBOSE_PREFIX_3 "Accepting a maximum of %d digits.\n", maxdigits); } if (!(varname) || ast_strlen_zero(varname)) { ast_log(LOG_WARNING, "Invalid! Usage: Read(variable[|filename][|maxdigits][|option][|attempts][|timeout])\n\n"); Index: cdr/cdr_pgsql.c =================================================================== RCS file: /usr/cvsroot/asterisk/cdr/cdr_pgsql.c,v retrieving revision 1.16 diff -u -r1.16 cdr_pgsql.c --- cdr/cdr_pgsql.c 21 Apr 2005 06:02:43 -0000 1.16 +++ cdr/cdr_pgsql.c 29 Apr 2005 01:22:27 -0000 @@ -101,7 +101,7 @@ snprintf(sqlcmd,sizeof(sqlcmd),"INSERT INTO %s (calldate,clid,src,dst,dcontext,channel,dstchannel," "lastapp,lastdata,duration,billsec,disposition,amaflags,accountcode,uniqueid,userfield) VALUES" - " ('%s','%s','%s','%s','%s', '%s','%s','%s','%s',%i,%i,'%s',%i,'%s','%s','%s')", + " ('%s','%s','%s','%s','%s', '%s','%s','%s','%s',%d,%d,'%s',%d,'%s','%s','%s')", table,timestr,clid,cdr->src, cdr->dst, dcontext,channel, dstchannel, lastapp, lastdata, cdr->duration,cdr->billsec,ast_cdr_disp2str(cdr->disposition),cdr->amaflags, cdr->accountcode, uniqueid, userfield); Index: channels/chan_phone.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_phone.c,v retrieving revision 1.50 diff -u -r1.50 chan_phone.c --- channels/chan_phone.c 21 Apr 2005 06:02:43 -0000 1.50 +++ channels/chan_phone.c 29 Apr 2005 02:00:47 -0000 @@ -219,7 +219,7 @@ ast_log(LOG_WARNING, "Unknown digit '%c'\n", digit); return -1; } - ast_log(LOG_NOTICE, "Dialed %i\n", outdigit); + ast_log(LOG_NOTICE, "Dialed %d\n", outdigit); ioctl(p->fd, PHONE_PLAY_TONE, outdigit); p->lastformat = -1; return 0; Index: cli.c =================================================================== RCS file: /usr/cvsroot/asterisk/cli.c,v retrieving revision 1.78 diff -u -r1.78 cli.c --- cli.c 22 Apr 2005 13:11:34 -0000 1.78 +++ cli.c 29 Apr 2005 02:12:47 -0000 @@ -583,7 +583,7 @@ char *filename = ""; if ((argc < 3) || (argc > 4)) return RESULT_SHOWUSAGE; - if (sscanf(argv[2], "%i", &newlevel) != 1) + if (sscanf(argv[2], "%d", &newlevel) != 1) return RESULT_SHOWUSAGE; option_debug = newlevel; if (argc == 4) { Index: pbx/pbx_config.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/pbx_config.c,v retrieving revision 1.58 diff -u -r1.58 pbx_config.c --- pbx/pbx_config.c 27 Apr 2005 04:52:58 -0000 1.58 +++ pbx/pbx_config.c 29 Apr 2005 16:58:40 -0000 @@ -1191,7 +1191,7 @@ if (!strcmp(prior, "hint")) { iprior = PRIORITY_HINT; } else { - if (sscanf(prior, "%i", &iprior) != 1) { + if (sscanf(prior, "%d", &iprior) != 1) { ast_cli(fd, "'%s' is not a valid priority\n", prior); prior = NULL; } @@ -1700,7 +1700,7 @@ else ast_log(LOG_WARNING, "Can't use 'same' priority on the first entry!\n"); } else { - if (sscanf(pri, "%i", &ipri) != 1) { + if (sscanf(pri, "%d", &ipri) != 1) { if ((ipri = ast_findlabel_extension2(NULL, con, realext, pri, cidmatch)) < 1) { ast_log(LOG_WARNING, "Invalid priority/label '%s' at line %d\n", pri, v->lineno); ipri = 0; Index: apps/app_dial.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v retrieving revision 1.151 diff -u -r1.151 app_dial.c --- apps/app_dial.c 29 Apr 2005 15:04:26 -0000 1.151 +++ apps/app_dial.c 29 Apr 2005 16:09:06 -0000 @@ -693,7 +693,7 @@ if ((cdl = strstr(transfer, "S("))) { calldurationlimit=atoi(cdl+2); if (option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_3 "Setting call duration limit to %i seconds.\n",calldurationlimit); + ast_verbose(VERBOSE_PREFIX_3 "Setting call duration limit to %d seconds.\n",calldurationlimit); } /* Extract DTMF strings to send upon successfull connect */ Index: apps/app_readfile.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_readfile.c,v retrieving revision 1.2 diff -u -r1.2 app_readfile.c --- apps/app_readfile.c 21 Apr 2005 06:02:43 -0000 1.2 +++ apps/app_readfile.c 29 Apr 2005 16:15:20 -0000 @@ -78,7 +78,7 @@ if(len < strlen(returnvar)) returnvar[len]='\0'; else - ast_log(LOG_WARNING,"%s is longer than %i, and %i \n",file,len,strlen(returnvar)); + ast_log(LOG_WARNING,"%s is longer than %d, and %d \n",file,len,strlen(returnvar)); } pbx_builtin_setvar_helper(chan, varname, returnvar); free(returnvar); Index: cdr/cdr_tds.c =================================================================== RCS file: /usr/cvsroot/asterisk/cdr/cdr_tds.c,v retrieving revision 1.8 diff -u -r1.8 cdr_tds.c --- cdr/cdr_tds.c 21 Apr 2005 06:02:43 -0000 1.8 +++ cdr/cdr_tds.c 29 Apr 2005 01:50:34 -0000 @@ -147,8 +147,8 @@ "%s, " /* start */ "%s, " /* answer */ "%s, " /* end */ - "%i, " /* duration */ - "%i, " /* billsec */ + "%d, " /* duration */ + "%d, " /* billsec */ "'%s', " /* disposition */ "'%s', " /* amaflags */ "'%s'" /* uniqueid */ Index: channels/chan_sip.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v retrieving revision 1.706 diff -u -r1.706 chan_sip.c --- channels/chan_sip.c 27 Apr 2005 01:29:28 -0000 1.706 +++ channels/chan_sip.c 29 Apr 2005 01:27:37 -0000 @@ -1619,7 +1619,7 @@ res = 0; ast_set_flag(p, SIP_OUTGOING); #ifdef OSP_SUPPORT - if (!osptoken || !osphandle || (sscanf(osphandle, "%i", &p->osphandle) != 1)) { + if (!osptoken || !osphandle || (sscanf(osphandle, "%d", &p->osphandle) != 1)) { /* Force Disable OSP support */ ast_log(LOG_DEBUG, "Disabling OSP support for this call. osptoken = %s, osphandle = %s\n", osptoken, osphandle); osptoken = NULL; @@ -3499,7 +3499,7 @@ struct sip_request resp; int seqno = 0; - if (reliable && (sscanf(get_header(req, "CSeq"), "%i ", &seqno) != 1)) { + if (reliable && (sscanf(get_header(req, "CSeq"), "%d ", &seqno) != 1)) { ast_log(LOG_WARNING, "Unable to determine sequence number from '%s'\n", get_header(req, "CSeq")); return -1; } @@ -3563,7 +3563,7 @@ char tmp[256]; int seqno = 0; - if (reliable && (sscanf(get_header(req, "CSeq"), "%i ", &seqno) != 1)) { + if (reliable && (sscanf(get_header(req, "CSeq"), "%d ", &seqno) != 1)) { ast_log(LOG_WARNING, "Unable to determine sequence number from '%s'\n", get_header(req, "CSeq")); return -1; } @@ -3814,7 +3814,7 @@ { struct sip_request resp; int seqno; - if (sscanf(get_header(req, "CSeq"), "%i ", &seqno) != 1) { + if (sscanf(get_header(req, "CSeq"), "%d ", &seqno) != 1) { ast_log(LOG_WARNING, "Unable to get seqno from '%s'\n", get_header(req, "CSeq")); return -1; } @@ -8848,7 +8848,7 @@ /* Must have Cseq */ if (ast_strlen_zero(cmd) || ast_strlen_zero(cseq)) return -1; - if (sscanf(cseq, "%i%n", &seqno, &len) != 1) { + if (sscanf(cseq, "%d%n", &seqno, &len) != 1) { ast_log(LOG_DEBUG, "No seqno in '%s'\n", cmd); return -1; } @@ -8887,7 +8887,7 @@ extract_uri(p, req); while(*e && (*e < 33)) e++; - if (sscanf(e, "%i %n", &respid, &len) != 1) { + if (sscanf(e, "%d %n", &respid, &len) != 1) { ast_log(LOG_WARNING, "Invalid response: '%s'\n", e); } else { handle_response(p, respid, e + len, req,ignore, seqno); @@ -10217,7 +10217,7 @@ ast_log(LOG_WARNING, "Unable to locate host '%s'\n", v->value); } else if (!strcasecmp(v->name, "outboundproxyport")) { /* Port needs to be after IP */ - sscanf(v->value, "%i", &format); + sscanf(v->value, "%d", &format); outboundproxyip.sin_port = htons(format); } else if (!strcasecmp(v->name, "autocreatepeer")) { autocreatepeer = ast_true(v->value); @@ -10265,7 +10265,7 @@ memcpy(&externip.sin_addr, hp->h_addr, sizeof(externip.sin_addr)); time(&externexpire); } else if (!strcasecmp(v->name, "externrefresh")) { - if (sscanf(v->value, "%i", &externrefresh) != 1) { + if (sscanf(v->value, "%d", &externrefresh) != 1) { ast_log(LOG_WARNING, "Invalid externrefresh value '%s', must be an integer >0 at line %d\n", v->value, v->lineno); externrefresh = 10; } @@ -10278,7 +10278,7 @@ } else if (!strcasecmp(v->name, "recordhistory")) { recordhistory = ast_true(v->value); } else if (!strcasecmp(v->name, "tos")) { - if (sscanf(v->value, "%i", &format) == 1) + if (sscanf(v->value, "%d", &format) == 1) tos = format & 0xff; else if (!strcasecmp(v->value, "lowdelay")) tos = IPTOS_LOWDELAY; @@ -10293,7 +10293,7 @@ else ast_log(LOG_WARNING, "Invalid tos value at line %d, should be 'lowdelay', 'throughput', 'reliability', 'mincost', or 'none'\n", v->lineno); } else if (!strcasecmp(v->name, "bindport")) { - if (sscanf(v->value, "%i", &ourport) == 1) { + if (sscanf(v->value, "%d", &ourport) == 1) { bindaddr.sin_port = htons(ourport); } else { ast_log(LOG_WARNING, "Invalid port number '%s' at line %d of %s\n", v->value, v->lineno, config); Index: channels/iax2-provision.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/iax2-provision.c,v retrieving revision 1.10 diff -u -r1.10 iax2-provision.c --- channels/iax2-provision.c 21 Apr 2005 06:02:44 -0000 1.10 +++ channels/iax2-provision.c 29 Apr 2005 02:06:21 -0000 @@ -287,7 +287,7 @@ v = ast_variable_browse(cfg, s); while(v) { if (!strcasecmp(v->name, "port") || !strcasecmp(v->name, "serverport")) { - if ((sscanf(v->value, "%i", &x) == 1) && (x > 0) && (x < 65535)) { + if ((sscanf(v->value, "%d", &x) == 1) && (x > 0) && (x < 65535)) { if (!strcasecmp(v->name, "port")) { cur->port = x; foundportno = 1; @@ -313,7 +313,7 @@ } else ast_log(LOG_WARNING, "Ignoring invalid codec '%s' for '%s' at line %d\n", v->value, s, v->lineno); } else if (!strcasecmp(v->name, "tos")) { - if (sscanf(v->value, "%i", &x) == 1) + if (sscanf(v->value, "%d", &x) == 1) cur->tos = x & 0xff; else if (!strcasecmp(v->value, "lowdelay")) cur->tos = IPTOS_LOWDELAY; Index: pbx/pbx_dundi.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/pbx_dundi.c,v retrieving revision 1.32 diff -u -r1.32 pbx_dundi.c --- pbx/pbx_dundi.c 21 Apr 2005 06:02:44 -0000 1.32 +++ pbx/pbx_dundi.c 29 Apr 2005 01:29:06 -0000 @@ -4059,7 +4059,7 @@ } else if (x >= 4) { strncpy(map->dcontext, name, sizeof(map->dcontext) - 1); strncpy(map->lcontext, fields[0], sizeof(map->lcontext) - 1); - if ((sscanf(fields[1], "%i", &map->weight) == 1) && (map->weight >= 0) && (map->weight < 60000)) { + if ((sscanf(fields[1], "%d", &map->weight) == 1) && (map->weight >= 0) && (map->weight < 60000)) { strncpy(map->dest, fields[3], sizeof(map->dest) - 1); if ((map->tech = str2tech(fields[2]))) { map->dead = 0; @@ -4502,14 +4502,14 @@ } else if (!strcasecmp(v->name, "authdebug")) { authdebug = ast_true(v->value); } else if (!strcasecmp(v->name, "ttl")) { - if ((sscanf(v->value, "%i", &x) == 1) && (x > 0) && (x < DUNDI_DEFAULT_TTL)) { + if ((sscanf(v->value, "%d", &x) == 1) && (x > 0) && (x < DUNDI_DEFAULT_TTL)) { dundi_ttl = x; } else { ast_log(LOG_WARNING, "'%s' is not a valid TTL at line %d, must be number from 1 to %d\n", v->value, v->lineno, DUNDI_DEFAULT_TTL); } } else if (!strcasecmp(v->name, "autokill")) { - if (sscanf(v->value, "%i", &x) == 1) { + if (sscanf(v->value, "%d", &x) == 1) { if (x >= 0) global_autokilltimeout = x; else @@ -4525,7 +4525,7 @@ else ast_log(LOG_WARNING, "Invalid global endpoint identifier '%s' at line %d\n", v->value, v->lineno); } else if (!strcasecmp(v->name, "tos")) { - if (sscanf(v->value, "%i", &format) == 1) + if (sscanf(v->value, "%d", &format) == 1) tos = format & 0xff; else if (!strcasecmp(v->value, "lowdelay")) tos = IPTOS_LOWDELAY; Index: apps/app_disa.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_disa.c,v retrieving revision 1.26 diff -u -r1.26 app_disa.c --- apps/app_disa.c 21 Apr 2005 06:02:43 -0000 1.26 +++ apps/app_disa.c 29 Apr 2005 01:18:46 -0000 @@ -143,8 +143,8 @@ ast_log(LOG_WARNING, "disa requires an argument (passcode/passcode file)\n"); return -1; } - ast_log(LOG_DEBUG, "Digittimeout: %i\n", digittimeout); - ast_log(LOG_DEBUG, "Responsetimeout: %i\n", firstdigittimeout); + ast_log(LOG_DEBUG, "Digittimeout: %d\n", digittimeout); + ast_log(LOG_DEBUG, "Responsetimeout: %d\n", firstdigittimeout); strncpy(tmp, (char *)data, sizeof(tmp)-1); stringp=tmp; strsep(&stringp, "|"); Index: apps/app_realtime.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_realtime.c,v retrieving revision 1.8 diff -u -r1.8 app_realtime.c --- apps/app_realtime.c 22 Apr 2005 03:29:03 -0000 1.8 +++ apps/app_realtime.c 29 Apr 2005 01:46:18 -0000 @@ -87,7 +87,7 @@ return RESULT_SUCCESS; } - ast_cli(fd, "Updated %i RealTime record(s).\n", res); + ast_cli(fd, "Updated %d RealTime record(s).\n", res); return RESULT_SUCCESS; } Index: channels/chan_h323.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v retrieving revision 1.108 diff -u -r1.108 chan_h323.c --- channels/chan_h323.c 21 Apr 2005 06:02:43 -0000 1.108 +++ channels/chan_h323.c 29 Apr 2005 01:53:22 -0000 @@ -1991,7 +1991,7 @@ else capability &= ~format; } else if (!strcasecmp(v->name, "tos")) { - if (sscanf(v->value, "%i", &format)) { + if (sscanf(v->value, "%d", &format)) { tos = format & 0xff; } else if (!strcasecmp(v->value, "lowdelay")) { tos = IPTOS_LOWDELAY; Index: channels/chan_skinny.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v retrieving revision 1.71 diff -u -r1.71 chan_skinny.c --- channels/chan_skinny.c 21 Apr 2005 06:02:44 -0000 1.71 +++ channels/chan_skinny.c 29 Apr 2005 02:02:25 -0000 @@ -2888,7 +2888,7 @@ else capability &= ~format; } else if (!strcasecmp(v->name, "port")) { - if (sscanf(v->value, "%i", &ourport) == 1) { + if (sscanf(v->value, "%d", &ourport) == 1) { bindaddr.sin_port = htons(ourport); } else { ast_log(LOG_WARNING, "Invalid port number '%s' at line %d of %s\n", v->value, v->lineno, config); Index: manager.c =================================================================== RCS file: /usr/cvsroot/asterisk/manager.c,v retrieving revision 1.93 diff -u -r1.93 manager.c --- manager.c 21 Apr 2005 06:02:43 -0000 1.93 +++ manager.c 29 Apr 2005 01:26:22 -0000 @@ -896,7 +896,7 @@ "Channel: %s/%s\r\n" "Context: %s\r\n" "Exten: %s\r\n" - "Reason: %i\r\n" + "Reason: %d\r\n" "Uniqueid: %s\r\n", in->idtext, in->tech, in->data, in->context, in->exten, reason, chan ? chan->uniqueid : ""); else @@ -906,7 +906,7 @@ "Channel: %s/%s\r\n" "Context: %s\r\n" "Exten: %s\r\n" - "Reason: %i\r\n" + "Reason: %d\r\n" "Uniqueid: %s\r\n", in->idtext, in->tech, in->data, in->context, in->exten, reason, chan ? chan->uniqueid : ""); Index: pbx/pbx_loopback.c =================================================================== RCS file: /usr/cvsroot/asterisk/pbx/pbx_loopback.c,v retrieving revision 1.5 diff -u -r1.5 pbx_loopback.c --- pbx/pbx_loopback.c 21 Apr 2005 06:02:44 -0000 1.5 +++ pbx/pbx_loopback.c 29 Apr 2005 01:41:49 -0000 @@ -108,7 +108,7 @@ if (con && !ast_strlen_zero(con)) *newcontext = con; if (pri && !ast_strlen_zero(pri)) - sscanf(pri, "%i", priority); + sscanf(pri, "%d", priority); } static int loopback_exists(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, const char *data) Index: apps/app_groupcount.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_groupcount.c,v retrieving revision 1.10 diff -u -r1.10 app_groupcount.c --- apps/app_groupcount.c 27 Apr 2005 01:50:53 -0000 1.10 +++ apps/app_groupcount.c 29 Apr 2005 16:17:55 -0000 @@ -114,7 +114,7 @@ ast_app_group_split_group(data, limit, sizeof(limit), category, sizeof(category)); - if ((sscanf(limit, "%i", &max) == 1) && (max > -1)) { + if ((sscanf(limit, "%d", &max) == 1) && (max > -1)) { count = ast_app_group_get_count(pbx_builtin_getvar_helper(chan, category), category); if (count > max) { if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num)) Index: apps/app_rpt.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_rpt.c,v retrieving revision 1.30 diff -u -r1.30 app_rpt.c --- apps/app_rpt.c 21 Apr 2005 06:02:43 -0000 1.30 +++ apps/app_rpt.c 29 Apr 2005 01:48:05 -0000 @@ -347,7 +347,7 @@ int ret; if (str == NULL) return -1; - if (sscanf(str,"%i",&ret) != 1) return -1; + if (sscanf(str,"%d",&ret) != 1) return -1; return ret; } Index: channels/chan_iax2.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v retrieving revision 1.273 diff -u -r1.273 chan_iax2.c --- channels/chan_iax2.c 22 Apr 2005 02:30:36 -0000 1.273 +++ channels/chan_iax2.c 29 Apr 2005 01:51:45 -0000 @@ -8360,7 +8360,7 @@ if (trunkfreq < 10) trunkfreq = 10; } else if (!strcasecmp(v->name, "autokill")) { - if (sscanf(v->value, "%i", &x) == 1) { + if (sscanf(v->value, "%d", &x) == 1) { if (x >= 0) autokill = x; else @@ -8393,7 +8393,7 @@ if (!ast_context_find(regcontext)) ast_context_create(NULL, regcontext, channeltype); } else if (!strcasecmp(v->name, "tos")) { - if (sscanf(v->value, "%i", &format) == 1) + if (sscanf(v->value, "%d", &format) == 1) tos = format & 0xff; else if (!strcasecmp(v->value, "lowdelay")) tos = IPTOS_LOWDELAY; Index: channels/chan_zap.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v retrieving revision 1.429 diff -u -r1.429 chan_zap.c --- channels/chan_zap.c 22 Apr 2005 19:10:35 -0000 1.429 +++ channels/chan_zap.c 29 Apr 2005 02:04:09 -0000 @@ -8321,7 +8321,7 @@ } if (e->hangup.aoc_units > -1) if (option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %i unit%s\n", + ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %d unit%s\n", pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, (int)e->hangup.aoc_units, (e->hangup.aoc_units == 1) ? "" : "s"); ast_mutex_unlock(&pri->pvts[chanpos]->lock); } else { @@ -8367,7 +8367,7 @@ ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d got hangup request\n", PRI_SPAN(e->hangup.channel), PRI_CHANNEL(e->hangup.channel), pri->span); if (e->hangup.aoc_units > -1) if (option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %i unit%s\n", + ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %d unit%s\n", pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, (int)e->hangup.aoc_units, (e->hangup.aoc_units == 1) ? "" : "s"); } else { pri_hangup(pri->pri, pri->pvts[chanpos]->call, e->hangup.cause); @@ -9758,7 +9758,7 @@ echocancel=128; } } else if (!strcasecmp(v->name, "echotraining")) { - if (sscanf(v->value, "%i", &y) == 1) { + if (sscanf(v->value, "%d", &y) == 1) { if ((y < 10) || (y > 4000)) { ast_log(LOG_WARNING, "Echo training time must be within the range of 10 to 2000 ms at line %d\n", v->lineno); } else { Index: apps/app_meetme.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v retrieving revision 1.95 diff -u -r1.95 app_meetme.c --- apps/app_meetme.c 21 Apr 2005 06:02:43 -0000 1.95 +++ apps/app_meetme.c 29 Apr 2005 01:04:53 -0000 @@ -464,7 +464,7 @@ /* Show all the users */ user = cnf->firstuser; while(user) { - ast_cli(fd, "User #: %i Channel: %s %s %s %s %s\n", user->user_no, user->chan->name, (user->userflags & CONFFLAG_ADMIN) ? "(Admin)" : "", (user->userflags & CONFFLAG_MONITOR) ? "(Listen only)" : "", (user->adminflags & ADMINFLAG_MUTED) ? "(Admn Muted)" : "", istalking(user->talking)); + ast_cli(fd, "User #: %d Channel: %s %s %s %s %s\n", user->user_no, user->chan->name, (user->userflags & CONFFLAG_ADMIN) ? "(Admin)" : "", (user->userflags & CONFFLAG_MONITOR) ? "(Listen only)" : "", (user->adminflags & ADMINFLAG_MUTED) ? "(Admn Muted)" : "", istalking(user->talking)); user = user->nextuser; } ast_cli(fd,"%d users in that conference.\n",cnf->users); @@ -535,7 +535,7 @@ /* Search for the user */ usr = cnf->firstuser; while(usr) { - snprintf(usrno, sizeof(usrno), "%i", usr->user_no); + snprintf(usrno, sizeof(usrno), "%d", usr->user_no); if (!strncasecmp(word, usrno, strlen(word))) { if (++which > state) break; @@ -839,7 +839,7 @@ "Channel: %s\r\n" "Uniqueid: %s\r\n" "Meetme: %s\r\n" - "Usernum: %i\r\n", + "Usernum: %d\r\n", chan->name, chan->uniqueid, conf->confno, user->user_no); if (!firstpass && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN)) { @@ -1047,7 +1047,7 @@ "Channel: %s\r\n" "Uniqueid: %s\r\n" "Meetme: %s\r\n" - "Usernum: %i\r\n", + "Usernum: %d\r\n", chan->name, chan->uniqueid, conf->confno, user->user_no); } if (user->talking && totalsilence > MEETME_DELAYDETECTENDTALK) { @@ -1056,7 +1056,7 @@ "Channel: %s\r\n" "Uniqueid: %s\r\n" "Meetme: %s\r\n" - "Usernum: %i\r\n", + "Usernum: %d\r\n", chan->name, chan->uniqueid, conf->confno, user->user_no); } } @@ -1273,7 +1273,7 @@ "Channel: %s\r\n" "Uniqueid: %s\r\n" "Meetme: %s\r\n" - "Usernum: %i\r\n", + "Usernum: %d\r\n", chan->name, chan->uniqueid, conf->confno, user->user_no); prev = NULL; conf->users--; @@ -1340,7 +1340,7 @@ } } /* Return the number of seconds the user was in the conf */ - snprintf(meetmesecs, sizeof(meetmesecs), "%i", (int) (time(NULL) - user->jointime)); + snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime)); pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs); } free(user); @@ -1451,7 +1451,7 @@ if (localdata && !ast_strlen_zero(localdata)){ /* have var so load it and exit */ - snprintf(val,sizeof(val), "%i",count); + snprintf(val,sizeof(val), "%d",count); pbx_builtin_setvar_helper(chan, localdata,val); } else { if (chan->_state != AST_STATE_UP) @@ -1706,7 +1706,7 @@ if (conf && callerident) { user = conf->firstuser; while(user) { - snprintf(usrno, sizeof(usrno), "%i", user->user_no); + snprintf(usrno, sizeof(usrno), "%d", user->user_no); if (strcmp(usrno, callerident) == 0) return user; user = user->nextuser; Index: res/res_features.c =================================================================== RCS file: /usr/cvsroot/asterisk/res/res_features.c,v retrieving revision 1.49 diff -u -r1.49 res_features.c --- res/res_features.c 22 Apr 2005 02:55:14 -0000 1.49 +++ res/res_features.c 29 Apr 2005 01:38:40 -0000 @@ -1563,7 +1563,7 @@ } else parkingtime = parkingtime * 1000; } else if (!strcasecmp(var->name, "parkpos")) { - if (sscanf(var->value, "%i-%i", &start, &end) != 2) { + if (sscanf(var->value, "%d-%d", &start, &end) != 2) { ast_log(LOG_WARNING, "Format for parking positions is a-b, where a and b are numbers at line %d of parking.conf\n", var->lineno); } else { parking_start = start;