archive: use GLib instead of utils.h
This commit is contained in:
parent
cf9bd42416
commit
e5b8a3b86d
@ -22,7 +22,6 @@
|
|||||||
|
|
||||||
#include "archive_api.h"
|
#include "archive_api.h"
|
||||||
#include "input_stream.h"
|
#include "input_stream.h"
|
||||||
#include "utils.h"
|
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
@ -22,7 +22,6 @@
|
|||||||
|
|
||||||
#include "archive_api.h"
|
#include "archive_api.h"
|
||||||
#include "input_stream.h"
|
#include "input_stream.h"
|
||||||
#include "utils.h"
|
|
||||||
|
|
||||||
#include <cdio/cdio.h>
|
#include <cdio/cdio.h>
|
||||||
#include <cdio/iso9660.h>
|
#include <cdio/iso9660.h>
|
||||||
@ -73,7 +72,7 @@ listdir_recur(const char *psz_path, iso_context *context)
|
|||||||
} else {
|
} else {
|
||||||
//remove leading /
|
//remove leading /
|
||||||
context->list = g_slist_prepend( context->list,
|
context->list = g_slist_prepend( context->list,
|
||||||
xstrdup(pathname+1));
|
g_strdup(pathname + 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_cdio_list_free (entlist, true);
|
_cdio_list_free (entlist, true);
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
#include "archive_api.h"
|
#include "archive_api.h"
|
||||||
#include "archive_api.h"
|
#include "archive_api.h"
|
||||||
#include "input_stream.h"
|
#include "input_stream.h"
|
||||||
#include "utils.h"
|
|
||||||
|
|
||||||
#include <zzip/zzip.h>
|
#include <zzip/zzip.h>
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
@ -58,7 +57,8 @@ zip_open(char * pathname)
|
|||||||
while (zzip_dir_read(context->dir, &dirent)) {
|
while (zzip_dir_read(context->dir, &dirent)) {
|
||||||
//add only files
|
//add only files
|
||||||
if (dirent.st_size > 0) {
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
#include "utils.h"
|
|
||||||
#include "archive_api.h"
|
#include "archive_api.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user