mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-19 03:08:45 +00:00
minor fix for refcount/flags to be unsigned
explicitly test refcount as a logical value for builtin_expect (thanks to rizzo for the cluebat!) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5651 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -129,8 +129,8 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
#define ASTOBJ_COMPONENTS_NOLOCK_FULL(type,namelen,hashes) \
|
#define ASTOBJ_COMPONENTS_NOLOCK_FULL(type,namelen,hashes) \
|
||||||
char name[namelen]; \
|
char name[namelen]; \
|
||||||
int refcount; \
|
unsigned int refcount; \
|
||||||
int objflags; \
|
unsigned int objflags; \
|
||||||
__ASTOBJ_HASH(type,hashes)
|
__ASTOBJ_HASH(type,hashes)
|
||||||
|
|
||||||
/*! \brief Add ASTOBJ components to a struct (without locking support).
|
/*! \brief Add ASTOBJ components to a struct (without locking support).
|
||||||
@@ -213,7 +213,7 @@ extern "C" {
|
|||||||
do { \
|
do { \
|
||||||
int newcount = 0; \
|
int newcount = 0; \
|
||||||
ASTOBJ_WRLOCK(object); \
|
ASTOBJ_WRLOCK(object); \
|
||||||
if (__builtin_expect((object)->refcount, 1)) \
|
if (__builtin_expect((object)->refcount > 0, 1)) \
|
||||||
newcount = --((object)->refcount); \
|
newcount = --((object)->refcount); \
|
||||||
else \
|
else \
|
||||||
ast_log(LOG_WARNING, "Unreferencing unreferenced (object)!\n"); \
|
ast_log(LOG_WARNING, "Unreferencing unreferenced (object)!\n"); \
|
||||||
|
Reference in New Issue
Block a user