[Asterisk-code-review] General: Avoid implicit conversion to char when changes valu... (asterisk[15])
Jenkins2
asteriskteam at digium.com
Mon Jan 8 06:47:01 CST 2018
Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/7851 )
Change subject: General: Avoid implicit conversion to char when changes value to negative.
......................................................................
General: Avoid implicit conversion to char when changes value to negative.
clang 5.0 warned about this.
ASTERISK-27557
Change-Id: I7cceaa88e147cbdf81a3a7beec5c1c20210fa41e
---
M addons/ooh323c/src/ootypes.h
M apps/app_adsiprog.c
M apps/app_sms.c
M res/res_http_websocket.c
4 files changed, 44 insertions(+), 43 deletions(-)
Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
diff --git a/addons/ooh323c/src/ootypes.h b/addons/ooh323c/src/ootypes.h
index cc7cd7c..71a7219 100644
--- a/addons/ooh323c/src/ootypes.h
+++ b/addons/ooh323c/src/ootypes.h
@@ -154,45 +154,45 @@
/**
Various message types for H225 and H245 messages
*/
-#define OO_MSGTYPE_MIN 101
-#define OOQ931MSG 101
-#define OOH245MSG 102
-#define OOSetup 103
-#define OOCallProceeding 104
-#define OOAlert 105
-#define OOConnect 106
-#define OOReleaseComplete 107
-#define OOFacility 108
-#define OOInformationMessage 109
-#define OOMasterSlaveDetermination 110
-#define OOMasterSlaveAck 111
-#define OOMasterSlaveReject 112
-#define OOMasterSlaveRelease 113
-#define OOTerminalCapabilitySet 114
-#define OOTerminalCapabilitySetAck 115
-#define OOTerminalCapabilitySetReject 116
-#define OOTerminalCapabilitySetRelease 117
-#define OOOpenLogicalChannel 118
-#define OOOpenLogicalChannelAck 119
-#define OOOpenLogicalChannelReject 120
-#define OOOpenLogicalChannelRelease 121
-#define OOOpenLogicalChannelConfirm 122
-#define OOCloseLogicalChannel 123
-#define OOCloseLogicalChannelAck 124
-#define OORequestChannelClose 125
-#define OORequestChannelCloseAck 126
-#define OORequestChannelCloseReject 127
-#define OORequestChannelCloseRelease 128
-#define OOEndSessionCommand 129
-#define OOUserInputIndication 130
-#define OORequestModeAck 131
-#define OORequestModeReject 132
-#define OORequestMode 133
-#define OORequestDelayResponse 134
-#define OORequestDelayRequest 135
-#define OOStatus 136
+#define OO_MSGTYPE_MIN 0x65
+#define OOQ931MSG 0x65
+#define OOH245MSG 0x66
+#define OOSetup 0x67
+#define OOCallProceeding 0x68
+#define OOAlert 0x69
+#define OOConnect 0x6a
+#define OOReleaseComplete 0x6b
+#define OOFacility 0x6c
+#define OOInformationMessage 0x6d
+#define OOMasterSlaveDetermination 0x6e
+#define OOMasterSlaveAck 0x6f
+#define OOMasterSlaveReject 0x70
+#define OOMasterSlaveRelease 0x71
+#define OOTerminalCapabilitySet 0x72
+#define OOTerminalCapabilitySetAck 0x73
+#define OOTerminalCapabilitySetReject 0x74
+#define OOTerminalCapabilitySetRelease 0x75
+#define OOOpenLogicalChannel 0x76
+#define OOOpenLogicalChannelAck 0x77
+#define OOOpenLogicalChannelReject 0x78
+#define OOOpenLogicalChannelRelease 0x79
+#define OOOpenLogicalChannelConfirm 0x7a
+#define OOCloseLogicalChannel 0x7b
+#define OOCloseLogicalChannelAck 0x7c
+#define OORequestChannelClose 0x7d
+#define OORequestChannelCloseAck 0x7e
+#define OORequestChannelCloseReject 0x7f
+#define OORequestChannelCloseRelease 0x80
+#define OOEndSessionCommand 0x81
+#define OOUserInputIndication 0x82
+#define OORequestModeAck 0x83
+#define OORequestModeReject 0x84
+#define OORequestMode 0x85
+#define OORequestDelayResponse 0x86
+#define OORequestDelayRequest 0x87
+#define OOStatus 0x88
-#define OO_MSGTYPE_MAX 136
+#define OO_MSGTYPE_MAX 0x88
/* Timer types */
#define OO_CALLESTB_TIMER (1<<0)
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 0659029..2dd226f 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -1109,7 +1109,7 @@
tmp[7] = '\0';
}
/* Setup initial stuff */
- state->key->retstr[0] = 128;
+ state->key->retstr[0] = 0x80;
/* 1 has the length */
state->key->retstr[2] = state->key->id;
/* Put the Full name in */
@@ -1145,7 +1145,7 @@
break;
}
/* Setup sub */
- state->sub->data[0] = 130;
+ state->sub->data[0] = 0x82;
/* 1 is the length */
state->sub->data[2] = 0x0; /* Clear extensibility bit */
state->sub->datalen = 3;
@@ -1262,7 +1262,7 @@
/* Something bad happened */
break;
}
- disp->data[0] = 129;
+ disp->data[0] = 0x81;
disp->data[1] = disp->datalen - 2;
disp->data[2] = ((lrci & 0x3) << 6) | disp->id;
disp->data[3] = wi;
diff --git a/apps/app_sms.c b/apps/app_sms.c
index 88985fb..c50a686 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -807,7 +807,7 @@
*p++ = '\\';
*p++ = 'r';
} else if (h->ud[n] < 32 || h->ud[n] == 127) {
- *p++ = 191;
+ *p++ = 0xbf;
} else {
*p++ = h->ud[n];
}
diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c
index baaa40f..86a1547 100644
--- a/res/res_http_websocket.c
+++ b/res/res_http_websocket.c
@@ -291,6 +291,7 @@
/*! \brief Close function for websocket session */
int AST_OPTIONAL_API_NAME(ast_websocket_close)(struct ast_websocket *session, uint16_t reason)
{
+ enum ast_websocket_opcode opcode = AST_WEBSOCKET_OPCODE_CLOSE;
char frame[4] = { 0, }; /* The header is 2 bytes and the reason code takes up another 2 bytes */
int res;
@@ -298,7 +299,7 @@
return 0;
}
- frame[0] = AST_WEBSOCKET_OPCODE_CLOSE | 0x80;
+ frame[0] = opcode | 0x80;
frame[1] = 2; /* The reason code is always 2 bytes */
/* If no reason has been specified assume 1000 which is normal closure */
--
To view, visit https://gerrit.asterisk.org/7851
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cceaa88e147cbdf81a3a7beec5c1c20210fa41e
Gerrit-Change-Number: 7851
Gerrit-PatchSet: 2
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180108/2ad88216/attachment-0001.html>
More information about the asterisk-code-review
mailing list