X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fifo.c;h=de0318414ad45aea2ba11326ccf2405756c9c5b1;hp=df165f743f89912e9e37a55eea94f12966aa34a2;hb=a1c58075279454a91ec43366846b93e8dcf9753c;hpb=f12b323f5d5ca40cd966ebbcfbbfcdf0a1fc229e diff --git a/fifo.c b/fifo.c index df165f74..de031841 100644 --- a/fifo.c +++ b/fifo.c @@ -69,23 +69,23 @@ unsigned int fifo_put(struct fifo *fifo, void *buffer, unsigned int len) return len; } -unsigned int fifo_get(struct fifo *fifo, void *buffer, unsigned int len) +unsigned int fifo_get(struct fifo *fifo, void *buf, unsigned int len) { len = min(len, fifo->in - fifo->out); - if (buffer) { + if (buf) { unsigned int l; /* * first get the data from fifo->out until the end of the buffer */ l = min(len, fifo->size - (fifo->out & (fifo->size - 1))); - memcpy(buffer, fifo->buffer + (fifo->out & (fifo->size - 1)),l); + memcpy(buf, fifo->buffer + (fifo->out & (fifo->size - 1)), l); /* * then get the rest (if any) from the beginning of the buffer */ - memcpy(buffer + l, fifo->buffer, len - l); + memcpy(buf + l, fifo->buffer, len - l); } fifo->out += len;