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

fix -Waggregate-return

Browse Source 
Signed-off-by: Eric Wong <normalperson@yhbt.net>

git-svn-id: https://svn.musicpd.org/mpd/trunk@7145 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann
2008-01-26 12:46:30 +00:00
committed by Eric Wong
parent 07eaad301a
commit 0659d35951
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tagTracker.c
View File

@@ -44,8 +44,8 @@ char *getTagItemString(int type, char *string)
if (FindInTree(tagTrees[type], string, &iter)) if (FindInTree(tagTrees[type], string, &iter))
{ {
((TagTrackerItem *)GetTreeKeyData(&iter).data)->count++; ((TagTrackerItem *)GetTreeKeyData(&iter)->data)->count++;
return (char *)GetTreeKeyData(&iter).key; return (char *)GetTreeKeyData(&iter)->key;
} }
else else
{ {
@@ -71,7 +71,7 @@ void removeTagItemString(int type, char *string)
if (FindInTree(tagTrees[type], string, &iter)) if (FindInTree(tagTrees[type], string, &iter))
{ {
TagTrackerItem * item = TagTrackerItem * item =
(TagTrackerItem *)GetTreeKeyData(&iter).data; (TagTrackerItem *)GetTreeKeyData(&iter)->data;
item->count--; item->count--;
if (item->count <= 0) if (item->count <= 0)
RemoveFromTreeByIterator(tagTrees[type], &iter); RemoveFromTreeByIterator(tagTrees[type], &iter);
@@ -103,7 +103,7 @@ void resetVisitedFlagsInTagTracker(int type)
!IsTreeIteratorAtEnd(&iter); !IsTreeIteratorAtEnd(&iter);
IncrementTreeIterator(&iter)) IncrementTreeIterator(&iter))
{ {
((TagTrackerItem *)GetTreeKeyData(&iter).data)->visited = 0; ((TagTrackerItem *)GetTreeKeyData(&iter)->data)->visited = 0;
} }
} }
@@ -117,7 +117,7 @@ void visitInTagTracker(int type, char *str)
if (!FindInTree(tagTrees[type], str, &iter)) if (!FindInTree(tagTrees[type], str, &iter))
return; return;
((TagTrackerItem *)GetTreeKeyData(&iter).data)->visited = 1; ((TagTrackerItem *)GetTreeKeyData(&iter)->data)->visited = 1;
} }
void printVisitedInTagTracker(int fd, int type) void printVisitedInTagTracker(int fd, int type)
@@ -132,14 +132,14 @@ void printVisitedInTagTracker(int fd, int type)
!IsTreeIteratorAtEnd(&iter); !IsTreeIteratorAtEnd(&iter);
IncrementTreeIterator(&iter)) IncrementTreeIterator(&iter))
{ {
item = ((TagTrackerItem *)GetTreeKeyData(&iter).data); item = ((TagTrackerItem *)GetTreeKeyData(&iter)->data);
if (item->visited) if (item->visited)
{ {
fdprintf(fd, fdprintf(fd,
"%s: %s\n", "%s: %s\n",
mpdTagItemKeys[type], mpdTagItemKeys[type],
(char *)GetTreeKeyData(&iter).key); (char *)GetTreeKeyData(&iter)->key);
} }
} }
} }

4
src/tree.c
View File

@@ -630,13 +630,13 @@ void IncrementTreeIterator(TreeIterator * iter)
} }
} }
TreeKeyData const TreeKeyData *
GetTreeKeyData(TreeIterator * iter) GetTreeKeyData(TreeIterator * iter)
{ {
assert(iter->node && assert(iter->node &&
iter->which > 0 && iter->which > 0 &&
iter->which <= iter->node->count); iter->which <= iter->node->count);
return iter->node->keyData[iter->which-1]; return &iter->node->keyData[iter->which-1];
} }
int int

2
src/tree.h
View File

@@ -51,7 +51,7 @@ void SetTreeIteratorToBegin(Tree * tree, TreeIterator * iter);
int IsTreeIteratorAtEnd(const TreeIterator * iter); int IsTreeIteratorAtEnd(const TreeIterator * iter);
void IncrementTreeIterator(TreeIterator * iter); void IncrementTreeIterator(TreeIterator * iter);
TreeKeyData GetTreeKeyData(TreeIterator * iter); const TreeKeyData *GetTreeKeyData(TreeIterator * iter);
int InsertInTree(Tree * tree, void * key, void * data); int InsertInTree(Tree * tree, void * key, void * data);
int RemoveFromTreeByKey(Tree * tree, void * key); int RemoveFromTreeByKey(Tree * tree, void * key);