Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Icecast-Server
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
94
Issues
94
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
Icecast-Server
Commits
bdbe3379
Commit
bdbe3379
authored
Oct 10, 2018
by
Philipp Schafft
🦁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update: Replaced buffer_new_simple() by refobject_new(buffer_t)
parent
48bb4773
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
13 deletions
+16
-13
src/buffer.c
src/buffer.c
+4
-3
src/buffer.h
src/buffer.h
+3
-1
src/tests/ctest_buffer.c
src/tests/ctest_buffer.c
+9
-9
No files found.
src/buffer.c
View file @
bdbe3379
...
...
@@ -38,12 +38,13 @@ static void __free(refobject_t self, void **userdata)
}
REFOBJECT_DEFINE_TYPE
(
buffer_t
,
REFOBJECT_DEFINE_TYPE_FREE
(
__free
)
REFOBJECT_DEFINE_TYPE_FREE
(
__free
),
REFOBJECT_DEFINE_TYPE_NEW_NOOP
()
);
buffer_t
*
buffer_new
(
ssize_t
preallocation
,
void
*
userdata
,
const
char
*
name
,
refobject_t
associated
)
{
buffer_t
*
buffer
=
refobject_new_
_new
(
buffer_t
,
userdata
,
name
,
associated
);
buffer_t
*
buffer
=
refobject_new_
ext
(
buffer_t
,
userdata
,
name
,
associated
);
if
(
!
buffer
)
return
NULL
;
...
...
@@ -56,7 +57,7 @@ buffer_t * buffer_new(ssize_t preallocation, void *userdata, const char *name,
buffer_t
*
buffer_new_simple
(
void
)
{
return
buffer_new
(
-
1
,
NULL
,
NULL
,
REFOBJECT_NULL
);
return
refobject_new
(
buffer_t
);
}
void
buffer_preallocate
(
buffer_t
*
buffer
,
size_t
request
)
...
...
src/buffer.h
View file @
bdbe3379
...
...
@@ -39,7 +39,9 @@ REFOBJECT_FORWARD_TYPE(buffer_t);
*/
buffer_t
*
buffer_new
(
ssize_t
preallocation
,
void
*
userdata
,
const
char
*
name
,
refobject_t
associated
);
/* This creates a new buffer with defaults.
/* Depreciated: This creates a new buffer with defaults.
* Do NOT use this. Use refobject_new(buffer_t)
*
* This is the same as:
* buffer_new(-1, NULL, NULL, REFOBJECT_NULL)
*/
...
...
src/tests/ctest_buffer.c
View file @
bdbe3379
...
...
@@ -25,7 +25,7 @@ static void test_create_ref_unref(void)
ctest_test
(
"buffer created"
,
a
!=
NULL
);
ctest_test
(
"un-referenced"
,
refobject_unref
(
a
)
==
0
);
a
=
buffer_new_simple
(
);
a
=
refobject_new
(
buffer_t
);
ctest_test
(
"buffer created"
,
a
!=
NULL
);
ctest_test
(
"un-referenced"
,
refobject_unref
(
a
)
==
0
);
...
...
@@ -102,7 +102,7 @@ static void test_empty(void)
const
char
*
string
;
int
ret
;
a
=
buffer_new_simple
(
);
a
=
refobject_new
(
buffer_t
);
ctest_test
(
"buffer created"
,
a
!=
NULL
);
ret
=
buffer_get_data
(
a
,
&
data
,
&
length
);
...
...
@@ -147,7 +147,7 @@ static void test_string(void)
const
char
*
string
=
NULL
;
int
ret
;
a
=
buffer_new_simple
(
);
a
=
refobject_new
(
buffer_t
);
ctest_test
(
"buffer created"
,
a
!=
NULL
);
ctest_test
(
"pushed string"
,
buffer_push_string
(
a
,
hw
)
==
0
);
ret
=
buffer_get_string
(
a
,
&
string
);
...
...
@@ -182,7 +182,7 @@ static void test_binary(void)
size_t
length
;
const
void
*
data
;
a
=
buffer_new_simple
(
);
a
=
refobject_new
(
buffer_t
);
ctest_test
(
"buffer created"
,
a
!=
NULL
);
ctest_test
(
"pushed data pattern a"
,
buffer_push_data
(
a
,
pattern_a
,
sizeof
(
pattern_a
))
==
0
);
...
...
@@ -238,7 +238,7 @@ static void test_shift(void)
buffer_t
*
a
;
const
char
*
pattern
=
"AABBBCC"
;
a
=
buffer_new_simple
(
);
a
=
refobject_new
(
buffer_t
);
ctest_test
(
"buffer created"
,
a
!=
NULL
);
ctest_test
(
"pushed string"
,
buffer_push_string
(
a
,
pattern
)
==
0
);
...
...
@@ -264,7 +264,7 @@ static void test_length(void)
const
char
*
match_b
=
"AABB"
;
const
char
*
match_c
=
""
;
a
=
buffer_new_simple
(
);
a
=
refobject_new
(
buffer_t
);
ctest_test
(
"buffer created"
,
a
!=
NULL
);
ctest_test
(
"pushed string"
,
buffer_push_string
(
a
,
pattern
)
==
0
);
...
...
@@ -290,7 +290,7 @@ static void test_printf(void)
const
char
*
match_b
=
":Hello World!:<-127 >"
;
const
char
*
match_c
=
":Hello World!:<-127 >? +127?"
;
a
=
buffer_new_simple
(
);
a
=
refobject_new
(
buffer_t
);
ctest_test
(
"buffer created"
,
a
!=
NULL
);
ctest_test
(
"Set length to match pattern a"
,
buffer_push_printf
(
a
,
":%s:"
,
str
)
==
0
);
...
...
@@ -310,9 +310,9 @@ static void test_push_buffer(void)
const
char
*
pattern
=
"AABBBCC"
;
const
char
*
match_a
=
"AABBBCCAABBBCC"
;
a
=
buffer_new_simple
(
);
a
=
refobject_new
(
buffer_t
);
ctest_test
(
"buffer a created"
,
a
!=
NULL
);
b
=
buffer_new_simple
(
);
b
=
refobject_new
(
buffer_t
);
ctest_test
(
"buffer b created"
,
b
!=
NULL
);
ctest_test
(
"pushed string"
,
buffer_push_string
(
a
,
pattern
)
==
0
);
...
...
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