Rename str_ptr to adhere to the current style

This commit is contained in:
Juan Antonio
2023-12-23 13:16:44 +01:00
committed by egzumer
parent ee0ba9886d
commit d75209bad0

View File

@@ -359,38 +359,38 @@ void UI_DisplayMain(void)
// show DTMF stuff // show DTMF stuff
#ifdef ENABLE_DTMF_CALLING #ifdef ENABLE_DTMF_CALLING
char Contact[16]; char Contact[16];
char *str_ptr = ""; char *pPrintStr = "";
if (!gDTMF_InputMode) { if (!gDTMF_InputMode) {
if (gDTMF_CallState == DTMF_CALL_STATE_CALL_OUT) { if (gDTMF_CallState == DTMF_CALL_STATE_CALL_OUT) {
str_ptr = DTMF_FindContact(gDTMF_String, Contact) ? Contact : gDTMF_String; pPrintStr = DTMF_FindContact(gDTMF_String, Contact) ? Contact : gDTMF_String;
} else if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED || gDTMF_CallState == DTMF_CALL_STATE_RECEIVED_STAY){ } else if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED || gDTMF_CallState == DTMF_CALL_STATE_RECEIVED_STAY){
str_ptr = DTMF_FindContact(gDTMF_Callee, Contact) ? Contact : gDTMF_Callee; pPrintStr = DTMF_FindContact(gDTMF_Callee, Contact) ? Contact : gDTMF_Callee;
}else if (gDTMF_IsTx) { }else if (gDTMF_IsTx) {
str_ptr = gDTMF_String; pPrintStr = gDTMF_String;
} }
} }
UI_PrintString(str_ptr, 2, 0, 2 + (vfo_num * 3), 8); UI_PrintString(pPrintStr, 2, 0, 2 + (vfo_num * 3), 8);
str_ptr = ""; pPrintStr = "";
if (!gDTMF_InputMode) { if (!gDTMF_InputMode) {
if (gDTMF_CallState == DTMF_CALL_STATE_CALL_OUT) { if (gDTMF_CallState == DTMF_CALL_STATE_CALL_OUT) {
str_ptr = (gDTMF_State == DTMF_STATE_CALL_OUT_RSP) ? "CALL OUT(RSP)" : "CALL OUT"; pPrintStr = (gDTMF_State == DTMF_STATE_CALL_OUT_RSP) ? "CALL OUT(RSP)" : "CALL OUT";
} else if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED || gDTMF_CallState == DTMF_CALL_STATE_RECEIVED_STAY) { } else if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED || gDTMF_CallState == DTMF_CALL_STATE_RECEIVED_STAY) {
sprintf(String, "CALL FRM:%s", (DTMF_FindContact(gDTMF_Caller, Contact)) ? Contact : gDTMF_Caller); sprintf(String, "CALL FRM:%s", (DTMF_FindContact(gDTMF_Caller, Contact)) ? Contact : gDTMF_Caller);
str_ptr = String; pPrintStr = String;
} else if (gDTMF_IsTx) { } else if (gDTMF_IsTx) {
str_ptr = (gDTMF_State == DTMF_STATE_TX_SUCC) ? "DTMF TX(SUCC)" : "DTMF TX"; pPrintStr = (gDTMF_State == DTMF_STATE_TX_SUCC) ? "DTMF TX(SUCC)" : "DTMF TX";
} }
} }
else else
#endif #endif
{ {
sprintf(String, ">%s", gDTMF_InputBox); sprintf(String, ">%s", gDTMF_InputBox);
str_ptr = String; pPrintStr = String;
} }
UI_PrintString(str_ptr, 2, 0, 0 + (vfo_num * 3), 8); UI_PrintString(pPrintStr, 2, 0, 0 + (vfo_num * 3), 8);
center_line = CENTER_LINE_IN_USE; center_line = CENTER_LINE_IN_USE;
continue; continue;