From e5b8a3b86d23fa4006a883c8123ba5fa07c4acee Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 2 Jan 2009 16:22:40 +0100
Subject: archive: use GLib instead of utils.h

---
 src/archive/bz2_plugin.c | 1 -
 src/archive/iso_plugin.c | 3 +--
 src/archive/zip_plugin.c | 4 ++--
 src/archive_api.c        | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/archive/bz2_plugin.c b/src/archive/bz2_plugin.c
index 00c59c693..982b88182 100644
--- a/src/archive/bz2_plugin.c
+++ b/src/archive/bz2_plugin.c
@@ -22,7 +22,6 @@
 
 #include "archive_api.h"
 #include "input_stream.h"
-#include "utils.h"
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/src/archive/iso_plugin.c b/src/archive/iso_plugin.c
index b374b9dfe..d74d69577 100644
--- a/src/archive/iso_plugin.c
+++ b/src/archive/iso_plugin.c
@@ -22,7 +22,6 @@
 
 #include "archive_api.h"
 #include "input_stream.h"
-#include "utils.h"
 
 #include <cdio/cdio.h>
 #include <cdio/iso9660.h>
@@ -73,7 +72,7 @@ listdir_recur(const char *psz_path, iso_context *context)
 		} else {
 			//remove leading /
 			context->list = g_slist_prepend( context->list,
-				xstrdup(pathname+1));
+				g_strdup(pathname + 1));
 		}
 	}
 	_cdio_list_free (entlist, true);
diff --git a/src/archive/zip_plugin.c b/src/archive/zip_plugin.c
index 76eec229d..1aa311065 100644
--- a/src/archive/zip_plugin.c
+++ b/src/archive/zip_plugin.c
@@ -23,7 +23,6 @@
 #include "archive_api.h"
 #include "archive_api.h"
 #include "input_stream.h"
-#include "utils.h"
 
 #include <zzip/zzip.h>
 #include <glib.h>
@@ -58,7 +57,8 @@ zip_open(char * pathname)
 	while (zzip_dir_read(context->dir, &dirent)) {
 		//add only files
 		if (dirent.st_size > 0) { 
-			context->list = g_slist_prepend( context->list, xstrdup(dirent.d_name));
+			context->list = g_slist_prepend(context->list,
+							g_strdup(dirent.d_name));
 		}
 	}
 
diff --git a/src/archive_api.c b/src/archive_api.c
index ddbcc43b3..92287a659 100644
--- a/src/archive_api.c
+++ b/src/archive_api.c
@@ -26,7 +26,6 @@
 #include <errno.h>
 #include <glib.h>
 
-#include "utils.h"
 #include "archive_api.h"
 
 /**
-- 
cgit v1.2.3