oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

tag: make tag_equal() return bool

Browse Source
This commit is contained in:
Max Kellermann 2009-02-27 08:06:59 +01:00
parent bcdf947afc
commit 5b07cbf0b4
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tag.c
View File

@ -36,7 +36,7 @@
static struct { static struct {
#ifndef NDEBUG #ifndef NDEBUG
int busy; bool busy;
#endif #endif
struct tag_item *items[BULK_MAX]; struct tag_item *items[BULK_MAX];
} bulk; } bulk;
@ -293,7 +293,7 @@ void tag_free(struct tag *tag)
if (tag->items == bulk.items) { if (tag->items == bulk.items) {
#ifndef NDEBUG #ifndef NDEBUG
assert(bulk.busy); assert(bulk.busy);
bulk.busy = 0; bulk.busy = false;
#endif #endif
} else } else
g_free(tag->items); g_free(tag->items);
@ -386,30 +386,30 @@ bool tag_has_type(const struct tag *tag, enum tag_type type)
return tag_get_value(tag, type) != NULL; return tag_get_value(tag, type) != NULL;
} }
int tag_equal(const struct tag *tag1, const struct tag *tag2) bool tag_equal(const struct tag *tag1, const struct tag *tag2)
{ {
int i; int i;
if (tag1 == NULL && tag2 == NULL) if (tag1 == NULL && tag2 == NULL)
return 1; return true;
else if (!tag1 || !tag2) else if (!tag1 || !tag2)
return 0; return false;
if (tag1->time != tag2->time) if (tag1->time != tag2->time)
return 0; return false;
if (tag1->numOfItems != tag2->numOfItems) if (tag1->numOfItems != tag2->numOfItems)
return 0; return false;
for (i = 0; i < tag1->numOfItems; i++) { for (i = 0; i < tag1->numOfItems; i++) {
if (tag1->items[i]->type != tag2->items[i]->type) if (tag1->items[i]->type != tag2->items[i]->type)
return 0; return false;
if (strcmp(tag1->items[i]->value, tag2->items[i]->value)) { if (strcmp(tag1->items[i]->value, tag2->items[i]->value)) {
return 0; return false;
} }
} }
return 1; return true;
} }
static char * static char *
@ -440,7 +440,7 @@ void tag_begin_add(struct tag *tag)
assert(tag->numOfItems == 0); assert(tag->numOfItems == 0);
#ifndef NDEBUG #ifndef NDEBUG
bulk.busy = 1; bulk.busy = true;
#endif #endif
tag->items = bulk.items; tag->items = bulk.items;
} }
@ -460,7 +460,7 @@ void tag_end_add(struct tag *tag)
} }
#ifndef NDEBUG #ifndef NDEBUG
bulk.busy = 0; bulk.busy = false;
#endif #endif
} }

2
src/tag.h
View File

@ -137,6 +137,6 @@ tag_get_value(const struct tag *tag, enum tag_type type);
*/ */
bool tag_has_type(const struct tag *tag, enum tag_type type); bool tag_has_type(const struct tag *tag, enum tag_type type);
int tag_equal(const struct tag *tag1, const struct tag *tag2); bool tag_equal(const struct tag *tag1, const struct tag *tag2);
#endif #endif