HR/EMS31_submodules
Template
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
Laila van Reenen 2024-04-14 22:50:18 +02:00
commit 9c30ea4ef1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CLI/CLI.c
View File

@ -96,9 +96,10 @@ void CLI_PrintHistory()
{
char** historyList;
int ret = History_getFullHistory(History, &historyList);
int i;
if (ret >= 0)
{
for (int i=0; *(historyList + i) != NULL; i++)
for (i=0; *(historyList + i) != NULL; i++)
{
printf("%03i: %s\n", i, *(historyList + i));
}
@ -263,6 +264,7 @@ bool CLI_charIn(char c)
FIFOBuffChar_delete(fifo);
break;
case 8:
case 127: // backspace
if (FIFOBuffChar_pop(FIFO))
{ // pop something of the buffer

6
History/History.c
View File

@ -153,7 +153,8 @@ int History_getFullHistory(History_t* history, char*** list)
*list = malloc(sizeof(char**) * (History_getSize(history) + 1));
History_element_t* el = history->FirstEl_p;
for (int i = 0; (i < History_getSize(history)-1) && (retCode >= 0); i++)
int i;
for (i = 0; (i < History_getSize(history)-1) && (retCode >= 0); i++)
{
*((*list) + i) = el->line;
if (el->nextEl_p == NULL)
@ -182,7 +183,8 @@ int History_getCurrPos(History_t* history)
if (history->CurrEl_p != NULL)
{
History_element_t* el = history->FirstEl_p;
for (int i = 0; (el != history->CurrEl_p) && (retCode >= 0); i++)
int i;
for (i = 0; (el != history->CurrEl_p) && (retCode >= 0); i++)
{
if (el->nextEl_p == NULL)
{