StdLib: Fix GCC warnings/errors caused by variables being set but not used.
Removed variables that had no effect on code behavior. Fifo.c::FIFO_Dequeue: Replaced instances of "Self->ElementSize" with preexisting variable "SizeOfElement". IIOutilities.c::IIO_GetInChar: Fixed variable of wrong, but compatible, type and made updating of housekeeping variables dependent upon successful completion of reading from the buffer. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin <olivier.martin@arm.com> Reviewed by: Daryl McDaniel <daryl.mcdaniel@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16276 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
committed by
darylm503
parent
b07ae3d607
commit
0e565888ee
@@ -292,17 +292,17 @@ FIFO_Dequeue (
|
||||
SizeOfElement = Self->ElementSize; // Get size of this FIFO's elements
|
||||
Count = MIN(Count, Self->Count(Self, AsElements)); // Lesser of requested or actual
|
||||
|
||||
QPtr = (UINTN)Self->Queue + (RDex * Self->ElementSize); // Point to Read location in FIFO
|
||||
QPtr = (UINTN)Self->Queue + (RDex * SizeOfElement); // Point to Read location in FIFO
|
||||
for(i = 0; i < Count; ++i) { // Iterate Count times...
|
||||
(void)CopyMem(pElement, (const void *)QPtr, Self->ElementSize); // Copy element from FIFO to caller's buffer
|
||||
(void)CopyMem(pElement, (const void *)QPtr, SizeOfElement); // Copy element from FIFO to caller's buffer
|
||||
RDex = (UINT32)ModuloIncrement(RDex, Self->NumElements); // Increment Read Index
|
||||
if(RDex == 0) { // If the index wrapped
|
||||
QPtr = (UINTN)Self->Queue; // Point back to beginning of data
|
||||
}
|
||||
else { // Otherwise
|
||||
QPtr += Self->ElementSize; // Point to the next element in FIFO
|
||||
QPtr += SizeOfElement; // Point to the next element in FIFO
|
||||
}
|
||||
pElement = (char*)pElement + Self->ElementSize; // Point to next element in caller's buffer
|
||||
pElement = (char*)pElement + SizeOfElement; // Point to next element in caller's buffer
|
||||
} // Iterate: for loop
|
||||
if(Consume) { // If caller requests data consumption
|
||||
Self->ReadIndex = RDex; // Set FIFO's Read Index to new Index
|
||||
|
Reference in New Issue
Block a user