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