From 94fffb332bb40eb4b13ad7a2039109d2a420a8f6 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 24 Jan 2013 19:18:58 +0100
Subject: archive/*: convert to C++
---
src/input/ArchiveInputPlugin.cxx | 94 ++++++++++++++++++++++++++++++++++++++++
src/input/ArchiveInputPlugin.hxx | 25 +++++++++++
src/input/archive_input_plugin.c | 83 -----------------------------------
src/input/archive_input_plugin.h | 25 -----------
4 files changed, 119 insertions(+), 108 deletions(-)
create mode 100644 src/input/ArchiveInputPlugin.cxx
create mode 100644 src/input/ArchiveInputPlugin.hxx
delete mode 100644 src/input/archive_input_plugin.c
delete mode 100644 src/input/archive_input_plugin.h
(limited to 'src/input')
diff --git a/src/input/ArchiveInputPlugin.cxx b/src/input/ArchiveInputPlugin.cxx
new file mode 100644
index 000000000..560c65843
--- /dev/null
+++ b/src/input/ArchiveInputPlugin.cxx
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "ArchiveInputPlugin.hxx"
+#include "ArchiveLookup.hxx"
+#include "ArchiveList.hxx"
+#include "ArchivePlugin.hxx"
+#include "input_plugin.h"
+
+#include <glib.h>
+
+/**
+ * select correct archive plugin to handle the input stream
+ * may allow stacking of archive plugins. for example for handling
+ * tar.gz a gzip handler opens file (through inputfile stream)
+ * then it opens a tar handler and sets gzip inputstream as
+ * parent_stream so tar plugin fetches file data from gzip
+ * plugin and gzip fetches file from disk
+ */
+static struct input_stream *
+input_archive_open(const char *pathname,
+ GMutex *mutex, GCond *cond,
+ GError **error_r)
+{
+ const struct archive_plugin *arplug;
+ struct archive_file *file;
+ char *archive, *filename, *suffix, *pname;
+ struct input_stream *is;
+
+ if (!g_path_is_absolute(pathname))
+ return NULL;
+
+ pname = g_strdup(pathname);
+ // archive_lookup will modify pname when true is returned
+ if (!archive_lookup(pname, &archive, &filename, &suffix)) {
+ g_debug("not an archive, lookup %s failed\n", pname);
+ g_free(pname);
+ return NULL;
+ }
+
+ //check which archive plugin to use (by ext)
+ arplug = archive_plugin_from_suffix(suffix);
+ if (!arplug) {
+ g_warning("can't handle archive %s\n",archive);
+ g_free(pname);
+ return NULL;
+ }
+
+ file = archive_file_open(arplug, archive, error_r);
+ if (file == NULL) {
+ g_free(pname);
+ return NULL;
+ }
+
+ //setup fileops
+ is = archive_file_open_stream(file, filename, mutex, cond,
+ error_r);
+ archive_file_close(file);
+ g_free(pname);
+
+ return is;
+}
+
+const struct input_plugin input_plugin_archive = {
+ "archive",
+ nullptr,
+ nullptr,
+ input_archive_open,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+};
diff --git a/src/input/ArchiveInputPlugin.hxx b/src/input/ArchiveInputPlugin.hxx
new file mode 100644
index 000000000..96fcd0dd1
--- /dev/null
+++ b/src/input/ArchiveInputPlugin.hxx
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_INPUT_ARCHIVE_HXX
+#define MPD_INPUT_ARCHIVE_HXX
+
+extern const struct input_plugin input_plugin_archive;
+
+#endif
diff --git a/src/input/archive_input_plugin.c b/src/input/archive_input_plugin.c
deleted file mode 100644
index e608dd4a6..000000000
--- a/src/input/archive_input_plugin.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "input/archive_input_plugin.h"
-#include "archive_api.h"
-#include "archive_list.h"
-#include "input_plugin.h"
-
-#include <glib.h>
-
-/**
- * select correct archive plugin to handle the input stream
- * may allow stacking of archive plugins. for example for handling
- * tar.gz a gzip handler opens file (through inputfile stream)
- * then it opens a tar handler and sets gzip inputstream as
- * parent_stream so tar plugin fetches file data from gzip
- * plugin and gzip fetches file from disk
- */
-static struct input_stream *
-input_archive_open(const char *pathname,
- GMutex *mutex, GCond *cond,
- GError **error_r)
-{
- const struct archive_plugin *arplug;
- struct archive_file *file;
- char *archive, *filename, *suffix, *pname;
- struct input_stream *is;
-
- if (!g_path_is_absolute(pathname))
- return NULL;
-
- pname = g_strdup(pathname);
- // archive_lookup will modify pname when true is returned
- if (!archive_lookup(pname, &archive, &filename, &suffix)) {
- g_debug("not an archive, lookup %s failed\n", pname);
- g_free(pname);
- return NULL;
- }
-
- //check which archive plugin to use (by ext)
- arplug = archive_plugin_from_suffix(suffix);
- if (!arplug) {
- g_warning("can't handle archive %s\n",archive);
- g_free(pname);
- return NULL;
- }
-
- file = archive_file_open(arplug, archive, error_r);
- if (file == NULL) {
- g_free(pname);
- return NULL;
- }
-
- //setup fileops
- is = archive_file_open_stream(file, filename, mutex, cond,
- error_r);
- archive_file_close(file);
- g_free(pname);
-
- return is;
-}
-
-const struct input_plugin input_plugin_archive = {
- .name = "archive",
- .open = input_archive_open,
-};
diff --git a/src/input/archive_input_plugin.h b/src/input/archive_input_plugin.h
deleted file mode 100644
index 51095f37f..000000000
--- a/src/input/archive_input_plugin.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_INPUT_ARCHIVE_H
-#define MPD_INPUT_ARCHIVE_H
-
-extern const struct input_plugin input_plugin_archive;
-
-#endif
--
cgit v1.2.3