Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Icecast-Server
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
102
Issues
102
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
Icecast-Server
Commits
4e1dc94c
Commit
4e1dc94c
authored
Jun 06, 2018
by
Philipp Schafft
🦁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Feature: Added some useful macros to refobject API
parent
ac372a2e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
15 deletions
+25
-15
src/refobject.c
src/refobject.c
+11
-15
src/refobject.h
src/refobject.h
+14
-0
No files found.
src/refobject.c
View file @
4e1dc94c
...
...
@@ -17,11 +17,7 @@
#include "refobject.h"
#ifdef HAVE_TYPE_ATTRIBUTE_TRANSPARENT_UNION
#define TO_BASE(x) ((x).refobject_base)
#else
#define TO_BASE(x) ((refobject_base_t*)(x))
#endif
#define TO_BASE(x) REFOBJECT_TO_TYPE((x), refobject_base_t *)
refobject_t
refobject_new
(
size_t
len
,
refobject_free_t
freecb
,
void
*
userdata
,
const
char
*
name
,
refobject_t
parent
)
{
...
...
@@ -44,14 +40,14 @@ refobject_t refobject_new(size_t len, refobject_free_t freecb, void *userdat
ret
->
name
=
strdup
(
name
);
if
(
!
ret
->
name
)
{
refobject_unref
(
ret
);
return
(
refobject_t
)(
refobject_base_t
*
)
NULL
;
return
REFOBJECT_
NULL
;
}
}
if
(
TO_BASE
(
parent
)
!=
NULL
)
{
if
(
!
REFOBJECT_IS_NULL
(
parent
)
)
{
if
(
refobject_ref
(
parent
)
!=
0
)
{
refobject_unref
(
ret
);
return
(
refobject_t
)(
refobject_base_t
*
)
NULL
;
return
REFOBJECT_
NULL
;
}
ret
->
parent
=
parent
;
...
...
@@ -62,7 +58,7 @@ refobject_t refobject_new(size_t len, refobject_free_t freecb, void *userdat
int
refobject_ref
(
refobject_t
self
)
{
if
(
TO_BASE
(
self
)
==
NULL
)
if
(
REFOBJECT_IS_NULL
(
self
)
)
return
-
1
;
thread_mutex_lock
(
&
(
TO_BASE
(
self
)
->
lock
));
...
...
@@ -76,7 +72,7 @@ int refobject_unref(refobject_t self)
{
register
refobject_base_t
*
base
=
TO_BASE
(
self
);
if
(
base
==
NULL
)
if
(
REFOBJECT_IS_NULL
(
self
)
)
return
-
1
;
thread_mutex_lock
(
&
(
base
->
lock
));
...
...
@@ -107,7 +103,7 @@ void * refobject_get_userdata(refobject_t self)
{
void
*
ret
;
if
(
TO_BASE
(
self
)
==
NULL
)
if
(
REFOBJECT_IS_NULL
(
self
)
)
return
NULL
;
thread_mutex_lock
(
&
(
TO_BASE
(
self
)
->
lock
));
...
...
@@ -119,7 +115,7 @@ void * refobject_get_userdata(refobject_t self)
int
refobject_set_userdata
(
refobject_t
self
,
void
*
userdata
)
{
if
(
TO_BASE
(
self
)
==
NULL
)
if
(
REFOBJECT_IS_NULL
(
self
)
)
return
-
1
;
thread_mutex_lock
(
&
(
TO_BASE
(
self
)
->
lock
));
...
...
@@ -133,7 +129,7 @@ const char * refobject_get_name(refobject_t self)
{
const
char
*
ret
;
if
(
TO_BASE
(
self
)
==
NULL
)
if
(
REFOBJECT_IS_NULL
(
self
)
)
return
NULL
;
thread_mutex_lock
(
&
(
TO_BASE
(
self
)
->
lock
));
...
...
@@ -147,8 +143,8 @@ refobject_t refobject_get_parent(refobject_t self)
{
refobject_t
ret
;
if
(
TO_BASE
(
self
)
==
NULL
)
return
(
refobject_t
)(
refobject_base_t
*
)
NULL
;
if
(
REFOBJECT_IS_NULL
(
self
)
)
return
REFOBJECT_
NULL
;
thread_mutex_lock
(
&
(
TO_BASE
(
self
)
->
lock
));
ret
=
TO_BASE
(
self
)
->
parent
;
...
...
src/refobject.h
View file @
4e1dc94c
...
...
@@ -9,11 +9,25 @@
#ifndef __REFOBJECT_H__
#define __REFOBJECT_H__
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "common/thread/thread.h"
#include "icecasttypes.h"
#include "compat.h"
#ifdef HAVE_TYPE_ATTRIBUTE_TRANSPARENT_UNION
#define REFOBJECT_NULL ((refobject_t)(refobject_base_t*)NULL)
#define REFOBJECT_IS_NULL(x) (((refobject_t)(x)).refobject_base == NULL)
#define REFOBJECT_TO_TYPE(x,y) ((y)(((refobject_t)(x)).refobject_base))
#else
#define REFOBJECT_NULL NULL
#define REFOBJECT_IS_NULL(x) ((x) == NULL)
#define REFOBJECT_TO_TYPE(x,y) ((y)(x))
#endif
typedef
void
(
*
refobject_free_t
)(
refobject_t
self
,
void
**
userdata
);
struct
refobject_base_tag
{
...
...
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