Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
35918c99
Commit
35918c99
authored
Aug 25, 2008
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed ringbuf.c warnings
Fix a "signed/unsigned comparison warning", and several void pointer math warnings.
parent
f9f70860
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
ringbuf.c
src/ringbuf.c
+4
-4
ringbuf.h
src/ringbuf.h
+1
-1
No files found.
src/ringbuf.c
View file @
35918c99
...
...
@@ -36,7 +36,7 @@ struct ringbuf *ringbuf_create(size_t sz)
struct
ringbuf
*
rb
=
xmalloc
(
sizeof
(
struct
ringbuf
));
size_t
power_of_two
;
for
(
power_of_two
=
1
;
1
<<
power_of_two
<
sz
;
power_of_two
++
)
for
(
power_of_two
=
1
;
(
size_t
)(
1
<<
power_of_two
)
<
sz
;
power_of_two
++
)
/* next power_of_two... */
;
rb
->
size
=
1
<<
power_of_two
;
...
...
@@ -137,7 +137,7 @@ size_t ringbuf_read(struct ringbuf * rb, void *dest, size_t cnt)
ringbuf_read_advance
(
rb
,
n1
);
if
(
n2
)
{
memcpy
(
dest
+
n1
,
rb
->
buf
+
rb
->
read_ptr
,
n2
);
memcpy
(
(
char
*
)
dest
+
n1
,
rb
->
buf
+
rb
->
read_ptr
,
n2
);
ringbuf_read_advance
(
rb
,
n2
);
}
...
...
@@ -175,7 +175,7 @@ size_t ringbuf_peek(struct ringbuf * rb, void *dest, size_t cnt)
advance_ptr
(
tmp_read_ptr
,
n1
,
rb
->
size_mask
);
if
(
n2
)
{
memcpy
(
dest
+
n1
,
rb
->
buf
+
tmp_read_ptr
,
n2
);
memcpy
(
(
char
*
)
dest
+
n1
,
rb
->
buf
+
tmp_read_ptr
,
n2
);
advance_ptr
(
tmp_read_ptr
,
n2
,
rb
->
size_mask
);
}
...
...
@@ -211,7 +211,7 @@ size_t ringbuf_write(struct ringbuf * rb, const void *src, size_t cnt)
ringbuf_write_advance
(
rb
,
n1
);
if
(
n2
)
{
memcpy
(
rb
->
buf
+
rb
->
write_ptr
,
src
+
n1
,
n2
);
memcpy
(
rb
->
buf
+
rb
->
write_ptr
,
(
const
char
*
)
src
+
n1
,
n2
);
ringbuf_write_advance
(
rb
,
n2
);
}
...
...
src/ringbuf.h
View file @
35918c99
...
...
@@ -39,7 +39,7 @@
*/
struct
ringbuf
{
void
*
buf
;
unsigned
char
*
buf
;
size_t
write_ptr
;
size_t
read_ptr
;
size_t
size
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment