Skip to content

Commit 9baa707

Browse files
committed
read/write: Fix the parameters name
1 parent 8f8028c commit 9baa707

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

lwrb/src/include/lwrb/lwrb.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ lwrb_sz_t lwrb_read(lwrb_t* buff, void* data, lwrb_sz_t btr);
121121
lwrb_sz_t lwrb_peek(const lwrb_t* buff, lwrb_sz_t skip_count, void* data, lwrb_sz_t btp);
122122

123123
/* Extended read/write functions */
124-
uint8_t lwrb_write_ex(lwrb_t* buff, const void* data, lwrb_sz_t btw, lwrb_sz_t* bw, uint16_t flags);
125-
uint8_t lwrb_read_ex(lwrb_t* buff, void* data, lwrb_sz_t btr, lwrb_sz_t* br, uint16_t flags);
124+
uint8_t lwrb_write_ex(lwrb_t* buff, const void* data, lwrb_sz_t btw, lwrb_sz_t* bwritten, uint16_t flags);
125+
uint8_t lwrb_read_ex(lwrb_t* buff, void* data, lwrb_sz_t btr, lwrb_sz_t* bread, uint16_t flags);
126126

127127
/* Buffer size information */
128128
lwrb_sz_t lwrb_get_free(const lwrb_t* buff);

lwrb/src/lwrb/lwrb.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@ lwrb_write(lwrb_t* buff, const void* data, lwrb_sz_t btw) {
170170
* \param buff: Ring buffer instance
171171
* \param data: Pointer to data to write into buffer
172172
* \param btw: Number of bytes to write
173-
* \param bw: Output pointer to write number of bytes written
173+
* \param bwritten: Output pointer to write number of bytes written into the buffer
174174
* \param flags: Optional flags.
175175
* \ref LWRB_FLAG_WRITE_ALL: Request to write all data (up to btw).
176176
* Will early return if no memory available
177177
* \return `1` if write operation OK, `0` otherwise
178178
*/
179179
uint8_t
180-
lwrb_write_ex(lwrb_t* buff, const void* data, lwrb_sz_t btw, lwrb_sz_t* bw, uint16_t flags) {
180+
lwrb_write_ex(lwrb_t* buff, const void* data, lwrb_sz_t btw, lwrb_sz_t* bwritten, uint16_t flags) {
181181
lwrb_sz_t tocopy = 0, free = 0, w_ptr = 0;
182182
const uint8_t* d_ptr = data;
183183

@@ -219,8 +219,8 @@ lwrb_write_ex(lwrb_t* buff, const void* data, lwrb_sz_t btw, lwrb_sz_t* bw, uint
219219
LWRB_STORE(buff->w_ptr, w_ptr, memory_order_release);
220220

221221
BUF_SEND_EVT(buff, LWRB_EVT_WRITE, tocopy + btw);
222-
if (bw != NULL) {
223-
*bw = tocopy + btw;
222+
if (bwritten != NULL) {
223+
*bwritten = tocopy + btw;
224224
}
225225
return 1;
226226
}
@@ -254,14 +254,15 @@ lwrb_read(lwrb_t* buff, void* data, lwrb_sz_t btr) {
254254
* \param buff: Ring buffer instance
255255
* \param data: Pointer to memory to write read data from buffer
256256
* \param btr: Number of bytes to read
257-
* \param br: Output pointer to write number of bytes read
257+
* \param bread: Output pointer to write number of bytes read from buffer and written to the
258+
* output `data` variable
258259
* \param flags: Optional flags
259260
* \ref LWRB_FLAG_READ_ALL: Request to read all data (up to btr).
260261
* Will early return if no enough bytes in the buffer
261262
* \return `1` if read operation OK, `0` otherwise
262263
*/
263264
uint8_t
264-
lwrb_read_ex(lwrb_t* buff, void* data, lwrb_sz_t btr, lwrb_sz_t* br, uint16_t flags) {
265+
lwrb_read_ex(lwrb_t* buff, void* data, lwrb_sz_t btr, lwrb_sz_t* bread, uint16_t flags) {
265266
lwrb_sz_t tocopy = 0, full = 0, r_ptr = 0;
266267
uint8_t* d_ptr = data;
267268

@@ -302,8 +303,8 @@ lwrb_read_ex(lwrb_t* buff, void* data, lwrb_sz_t btr, lwrb_sz_t* br, uint16_t fl
302303
LWRB_STORE(buff->r_ptr, r_ptr, memory_order_release);
303304

304305
BUF_SEND_EVT(buff, LWRB_EVT_READ, tocopy + btr);
305-
if (br != NULL) {
306-
*br = tocopy + btr;
306+
if (bread != NULL) {
307+
*bread = tocopy + btr;
307308
}
308309
return 1;
309310
}

0 commit comments

Comments
 (0)