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

locate: use GLib instead of utils.h

Browse Source
This commit is contained in:
Max Kellermann 2009-01-02 16:24:16 +01:00
parent e5b8a3b86d
commit 8cf9138541
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/locate.c
View File

@ -18,12 +18,13 @@
#include "locate.h" #include "locate.h"
#include "path.h" #include "path.h"
#include "utils.h"
#include "tag.h" #include "tag.h"
#include "song.h" #include "song.h"
#include <glib.h> #include <glib.h>
#include <stdlib.h>
#define LOCATE_TAG_FILE_KEY "file" #define LOCATE_TAG_FILE_KEY "file"
#define LOCATE_TAG_FILE_KEY_OLD "filename" #define LOCATE_TAG_FILE_KEY_OLD "filename"
#define LOCATE_TAG_ANY_KEY "any" #define LOCATE_TAG_ANY_KEY "any"
@ -60,14 +61,14 @@ static int initLocateTagItem(LocateTagItem * item,
if (item->tagType < 0) if (item->tagType < 0)
return -1; return -1;
item->needle = xstrdup(needle); item->needle = g_strdup(needle);
return 0; return 0;
} }
LocateTagItem *newLocateTagItem(const char *typeStr, const char *needle) LocateTagItem *newLocateTagItem(const char *typeStr, const char *needle)
{ {
LocateTagItem *ret = xmalloc(sizeof(LocateTagItem)); LocateTagItem *ret = g_new(LocateTagItem, 1);
if (initLocateTagItem(ret, typeStr, needle) < 0) { if (initLocateTagItem(ret, typeStr, needle) < 0) {
free(ret); free(ret);
@ -99,7 +100,7 @@ int newLocateTagItemArrayFromArgArray(char *argArray[],
if (numArgs % 2 != 0) if (numArgs % 2 != 0)
return -1; return -1;
*arrayRet = xmalloc(sizeof(LocateTagItem) * numArgs / 2); *arrayRet = g_new(LocateTagItem, numArgs / 2);
for (i = 0, item = *arrayRet; i < numArgs / 2; i++, item++) { for (i = 0, item = *arrayRet; i < numArgs / 2; i++, item++) {
if (initLocateTagItem if (initLocateTagItem