Commit 8cf91385 authored by Max Kellermann's avatar Max Kellermann

locate: use GLib instead of utils.h

parent e5b8a3b8
...@@ -18,12 +18,13 @@ ...@@ -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, ...@@ -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[], ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment