kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix more dev-mode build issues

Browse Source 
........

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

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

Merged revisions 419163 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2014-07-22 14:22:00 +00:00
parent 878db87fc0
commit 9056c23bbd
19 changed files with 78 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
addons/ooh323c/src/ooq931.c
View File

@@ -319,7 +319,7 @@ char* ooQ931GetMessageTypeName(int messageType, char* buf) {
strcpy(buf, "Escape");
break;
default:
sprintf(buf, "<%u>", messageType);
sprintf(buf, "<%d>", messageType);
}
return buf;
}
@@ -360,7 +360,7 @@ char* ooQ931GetIEName(int number, char* buf) {
strcpy(buf, "User-User");
break;
default:
sprintf(buf, "0x%02x", number);
sprintf(buf, "0x%02x", (unsigned)number);
}
return buf;
}
@@ -371,8 +371,8 @@ EXTERN void ooQ931Print (const Q931Message* q931msg) {
unsigned int i;
printf("Q.931 Message:\n");
printf(" protocolDiscriminator: %i\n", q931msg->protocolDiscriminator);
printf(" callReference: %i\n", q931msg->callReference);
printf(" protocolDiscriminator: %u\n", q931msg->protocolDiscriminator);
printf(" callReference: %u\n", q931msg->callReference);
printf(" from: %s\n", (q931msg->fromDestination ?
"destination" : "originator"));
printf(" messageType: %s (0x%X)\n\n",
@@ -382,9 +382,9 @@ EXTERN void ooQ931Print (const Q931Message* q931msg) {
for(i = 0, curNode = q931msg->ies.head; i < q931msg->ies.count; i++) {
Q931InformationElement *ie = (Q931InformationElement*) curNode->data;
int length = (ie->length >= 0) ? ie->length : -ie->length;
printf(" IE[%i] (offset 0x%X):\n", i, ie->offset);
printf(" IE[%u] (offset 0x%X):\n", i, (unsigned)ie->offset);
printf(" discriminator: %s (0x%X)\n",
ooQ931GetIEName(ie->discriminator, buf), ie->discriminator);
ooQ931GetIEName(ie->discriminator, buf), (unsigned)ie->discriminator);
printf(" data length: %i\n", length);
curNode = curNode->next;

2
addons/ooh323c/src/printHandler.c
View File

@@ -268,7 +268,7 @@ static const char* octStrToString
if (bufsiz > 1) buffer[1] = '\0';
for (i = 0; i < numocts; i++) {
if (i < bufsiz - 1) {
sprintf (lbuf, "%02x", data[i]);
sprintf (lbuf, "%02x", (unsigned)data[i]);
strcat (&buffer[(i*2)+1], lbuf);
}
else break;