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

update: include config.h, fix archive code

Browse Source 
The archive code was disabled, because config.h was not included and
thus ENABLE_ARCHIVE was not defined.
This commit is contained in:
Max Kellermann
2009-01-08 21:20:41 +01:00
parent 7a9a1e3e31
commit f0980283bc
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/update.c
View File

@@ -25,6 +25,7 @@
#include "mapper.h" #include "mapper.h"
#include "path.h" #include "path.h"
#include "decoder_list.h" #include "decoder_list.h"
#include "archive_list.h"
#include "playlist.h" #include "playlist.h"
#include "event_pipe.h" #include "event_pipe.h"
#include "notify.h" #include "notify.h"
@@ -33,6 +34,7 @@
#include "conf.h" #include "conf.h"
#include "stats.h" #include "stats.h"
#include "main.h" #include "main.h"
#include "config.h"
#include <glib.h> #include <glib.h>
@@ -350,6 +352,9 @@ update_regular_file(struct directory *directory,
const char *name, const struct stat *st) const char *name, const struct stat *st)
{ {
const char *suffix = uri_get_suffix(name); const char *suffix = uri_get_suffix(name);
#ifdef ENABLE_ARCHIVE
const struct archive_plugin *archive;
#endif
if (suffix == NULL) if (suffix == NULL)
return; return;
@@ -376,9 +381,9 @@ update_regular_file(struct directory *directory,
#ifdef ENABLE_ARCHIVE #ifdef ENABLE_ARCHIVE
} else if ((archive = archive_plugin_from_suffix(suffix))) { } else if ((archive = archive_plugin_from_suffix(suffix))) {
struct archive_file *archfile; struct archive_file *archfile;
char pathname[MPD_PATH_MAX]; char *pathname;
map_directory_child_fs(directory, name, pathname); pathname = map_directory_child_fs(directory, name);
//open archive //open archive
archfile = archive->open(pathname); archfile = archive->open(pathname);
if (archfile) { if (archfile) {
@@ -404,6 +409,8 @@ update_regular_file(struct directory *directory,
} else { } else {
g_warning("unable to open archive %s", pathname); g_warning("unable to open archive %s", pathname);
} }
g_free(pathname);
#endif #endif
} }
} }
@@ -415,10 +422,6 @@ static void
updateInDirectory(struct directory *directory, updateInDirectory(struct directory *directory,
const char *name, const struct stat *st) const char *name, const struct stat *st)
{ {
#ifdef ENABLE_ARCHIVE
const struct archive_plugin *archive;
#endif
assert(strchr(name, '/') == NULL); assert(strchr(name, '/') == NULL);
if (S_ISREG(st->st_mode)) { if (S_ISREG(st->st_mode)) {