merge conf reslove
This commit is contained in:
commit
bb79053b1e
@ -141,7 +141,7 @@ bool FIFOBuffChar_pop(FIFOBuffChar_t *fifo)
|
|||||||
|
|
||||||
default: // buffer is at least 2 element big
|
default: // buffer is at least 2 element big
|
||||||
// find the second last element
|
// find the second last element
|
||||||
{
|
{
|
||||||
FIFOBuffChar_element_t* secondLastEl = fifo->FirstEl_p;
|
FIFOBuffChar_element_t* secondLastEl = fifo->FirstEl_p;
|
||||||
while (
|
while (
|
||||||
secondLastEl->nextElement != fifo->LastEl_p
|
secondLastEl->nextElement != fifo->LastEl_p
|
||||||
@ -159,7 +159,7 @@ bool FIFOBuffChar_pop(FIFOBuffChar_t *fifo)
|
|||||||
fifo->size--;
|
fifo->size--;
|
||||||
ok = true;
|
ok = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ok;
|
return ok;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user