mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	General: Avoid implicit conversion to char when changes value to negative.
clang 5.0 warned about this. ASTERISK-27557 Change-Id: I7cceaa88e147cbdf81a3a7beec5c1c20210fa41e
This commit is contained in:
		| @@ -154,45 +154,45 @@ typedef enum OOCallClearReason { | |||||||
| /** | /** | ||||||
|    Various message types for H225 and H245 messages |    Various message types for H225 and H245 messages | ||||||
| */ | */ | ||||||
| #define OO_MSGTYPE_MIN                     101 | #define OO_MSGTYPE_MIN                     0x65 | ||||||
| #define OOQ931MSG                          101 | #define OOQ931MSG                          0x65 | ||||||
| #define OOH245MSG                          102 | #define OOH245MSG                          0x66 | ||||||
| #define OOSetup                            103 | #define OOSetup                            0x67 | ||||||
| #define OOCallProceeding                   104 | #define OOCallProceeding                   0x68 | ||||||
| #define OOAlert                            105 | #define OOAlert                            0x69 | ||||||
| #define OOConnect                          106 | #define OOConnect                          0x6a | ||||||
| #define OOReleaseComplete                  107 | #define OOReleaseComplete                  0x6b | ||||||
| #define OOFacility                         108 | #define OOFacility                         0x6c | ||||||
| #define OOInformationMessage               109 | #define OOInformationMessage               0x6d | ||||||
| #define OOMasterSlaveDetermination         110 | #define OOMasterSlaveDetermination         0x6e | ||||||
| #define OOMasterSlaveAck                   111 | #define OOMasterSlaveAck                   0x6f | ||||||
| #define OOMasterSlaveReject                112 | #define OOMasterSlaveReject                0x70 | ||||||
| #define OOMasterSlaveRelease               113 | #define OOMasterSlaveRelease               0x71 | ||||||
| #define OOTerminalCapabilitySet            114 | #define OOTerminalCapabilitySet            0x72 | ||||||
| #define OOTerminalCapabilitySetAck         115 | #define OOTerminalCapabilitySetAck         0x73 | ||||||
| #define OOTerminalCapabilitySetReject      116 | #define OOTerminalCapabilitySetReject      0x74 | ||||||
| #define OOTerminalCapabilitySetRelease     117 | #define OOTerminalCapabilitySetRelease     0x75 | ||||||
| #define OOOpenLogicalChannel               118 | #define OOOpenLogicalChannel               0x76 | ||||||
| #define OOOpenLogicalChannelAck            119 | #define OOOpenLogicalChannelAck            0x77 | ||||||
| #define OOOpenLogicalChannelReject         120 | #define OOOpenLogicalChannelReject         0x78 | ||||||
| #define OOOpenLogicalChannelRelease        121 | #define OOOpenLogicalChannelRelease        0x79 | ||||||
| #define OOOpenLogicalChannelConfirm        122 | #define OOOpenLogicalChannelConfirm        0x7a | ||||||
| #define OOCloseLogicalChannel              123 | #define OOCloseLogicalChannel              0x7b | ||||||
| #define OOCloseLogicalChannelAck           124 | #define OOCloseLogicalChannelAck           0x7c | ||||||
| #define OORequestChannelClose              125 | #define OORequestChannelClose              0x7d | ||||||
| #define OORequestChannelCloseAck           126 | #define OORequestChannelCloseAck           0x7e | ||||||
| #define OORequestChannelCloseReject        127 | #define OORequestChannelCloseReject        0x7f | ||||||
| #define OORequestChannelCloseRelease       128 | #define OORequestChannelCloseRelease       0x80 | ||||||
| #define OOEndSessionCommand                129 | #define OOEndSessionCommand                0x81 | ||||||
| #define OOUserInputIndication              130 | #define OOUserInputIndication              0x82 | ||||||
| #define OORequestModeAck		   131 | #define OORequestModeAck		   0x83 | ||||||
| #define OORequestModeReject		   132 | #define OORequestModeReject		   0x84 | ||||||
| #define OORequestMode			   133 | #define OORequestMode			   0x85 | ||||||
| #define OORequestDelayResponse		   134 | #define OORequestDelayResponse		   0x86 | ||||||
| #define OORequestDelayRequest		   135 | #define OORequestDelayRequest		   0x87 | ||||||
| #define OOStatus			   136 | #define OOStatus			   0x88 | ||||||
|  |  | ||||||
| #define OO_MSGTYPE_MAX                     136 | #define OO_MSGTYPE_MAX                     0x88 | ||||||
|  |  | ||||||
| /* Timer types */ | /* Timer types */ | ||||||
| #define OO_CALLESTB_TIMER  (1<<0) | #define OO_CALLESTB_TIMER  (1<<0) | ||||||
|   | |||||||
| @@ -1111,7 +1111,7 @@ static int adsi_process(struct adsi_script *state, char *buf, const char *script | |||||||
| 				tmp[7] = '\0'; | 				tmp[7] = '\0'; | ||||||
| 			} | 			} | ||||||
| 			/* Setup initial stuff */ | 			/* Setup initial stuff */ | ||||||
| 			state->key->retstr[0] = 128; | 			state->key->retstr[0] = 0x80; | ||||||
| 			/* 1 has the length */ | 			/* 1 has the length */ | ||||||
| 			state->key->retstr[2] = state->key->id; | 			state->key->retstr[2] = state->key->id; | ||||||
| 			/* Put the Full name in */ | 			/* Put the Full name in */ | ||||||
| @@ -1147,7 +1147,7 @@ static int adsi_process(struct adsi_script *state, char *buf, const char *script | |||||||
| 				break; | 				break; | ||||||
| 			} | 			} | ||||||
| 			/* Setup sub */ | 			/* Setup sub */ | ||||||
| 			state->sub->data[0] = 130; | 			state->sub->data[0] = 0x82; | ||||||
| 			/* 1 is the length */ | 			/* 1 is the length */ | ||||||
| 			state->sub->data[2] = 0x0; /* Clear extensibility bit */ | 			state->sub->data[2] = 0x0; /* Clear extensibility bit */ | ||||||
| 			state->sub->datalen = 3; | 			state->sub->datalen = 3; | ||||||
| @@ -1264,7 +1264,7 @@ static int adsi_process(struct adsi_script *state, char *buf, const char *script | |||||||
| 				/* Something bad happened */ | 				/* Something bad happened */ | ||||||
| 				break; | 				break; | ||||||
| 			} | 			} | ||||||
| 			disp->data[0] = 129; | 			disp->data[0] = 0x81; | ||||||
| 			disp->data[1] = disp->datalen - 2; | 			disp->data[1] = disp->datalen - 2; | ||||||
| 			disp->data[2] = ((lrci & 0x3) << 6) | disp->id; | 			disp->data[2] = ((lrci & 0x3) << 6) | disp->id; | ||||||
| 			disp->data[3] = wi; | 			disp->data[3] = wi; | ||||||
|   | |||||||
| @@ -801,7 +801,7 @@ static void sms_log(sms_t * h, char status) | |||||||
| 				*p++ = '\\'; | 				*p++ = '\\'; | ||||||
| 				*p++ = 'r'; | 				*p++ = 'r'; | ||||||
| 			} else if (h->ud[n] < 32 || h->ud[n] == 127) { | 			} else if (h->ud[n] < 32 || h->ud[n] == 127) { | ||||||
| 				*p++ = 191; | 				*p++ = 0xbf; | ||||||
| 			} else { | 			} else { | ||||||
| 				*p++ = h->ud[n]; | 				*p++ = h->ud[n]; | ||||||
| 			} | 			} | ||||||
|   | |||||||
| @@ -291,6 +291,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_server_remove_protocol)(struct ast_webso | |||||||
| /*! \brief Close function for websocket session */ | /*! \brief Close function for websocket session */ | ||||||
| int AST_OPTIONAL_API_NAME(ast_websocket_close)(struct ast_websocket *session, uint16_t reason) | 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 */ | 	char frame[4] = { 0, }; /* The header is 2 bytes and the reason code takes up another 2 bytes */ | ||||||
| 	int res; | 	int res; | ||||||
|  |  | ||||||
| @@ -298,7 +299,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_close)(struct ast_websocket *session, ui | |||||||
| 		return 0; | 		return 0; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	frame[0] = AST_WEBSOCKET_OPCODE_CLOSE | 0x80; | 	frame[0] = opcode | 0x80; | ||||||
| 	frame[1] = 2; /* The reason code is always 2 bytes */ | 	frame[1] = 2; /* The reason code is always 2 bytes */ | ||||||
|  |  | ||||||
| 	/* If no reason has been specified assume 1000 which is normal closure */ | 	/* If no reason has been specified assume 1000 which is normal closure */ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user