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

fs/io/GzipOutputStream,GunzipReader: move zlib_domain to src/lib/zlib/Domain.cxx

Browse Source
This commit is contained in:
Max Kellermann 2014-08-11 21:46:13 +02:00
parent fc0c5e7359
commit 3a111e5d74
7 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -529,6 +529,7 @@ libfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS)
if HAVE_ZLIB if HAVE_ZLIB
libfs_a_SOURCES += \ libfs_a_SOURCES += \
src/lib/zlib/Domain.cxx src/lib/zlib/Domain.hxx \
src/fs/io/GunzipReader.cxx src/fs/io/GunzipReader.hxx \ src/fs/io/GunzipReader.cxx src/fs/io/GunzipReader.hxx \
src/fs/io/GzipOutputStream.cxx src/fs/io/GzipOutputStream.hxx src/fs/io/GzipOutputStream.cxx src/fs/io/GzipOutputStream.hxx
FS_LIBS += $(ZLIB_LIBS) FS_LIBS += $(ZLIB_LIBS)

3
src/fs/io/GunzipReader.cxx
View File

@ -19,11 +19,10 @@
#include "config.h" #include "config.h"
#include "GunzipReader.hxx" #include "GunzipReader.hxx"
#include "lib/zlib/Domain.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
const Domain zlib_domain("zlib");
GunzipReader::GunzipReader(Reader &_next, Error &error) GunzipReader::GunzipReader(Reader &_next, Error &error)
:next(_next), eof(false) :next(_next), eof(false)
{ {

2
src/fs/io/GunzipReader.hxx
View File

@ -29,8 +29,6 @@
class Error; class Error;
class Domain; class Domain;
extern const Domain zlib_domain;
/** /**
* A filter that decompresses data using zlib. * A filter that decompresses data using zlib.
*/ */

3
src/fs/io/GzipOutputStream.cxx
View File

@ -19,11 +19,10 @@
#include "config.h" #include "config.h"
#include "GzipOutputStream.hxx" #include "GzipOutputStream.hxx"
#include "lib/zlib/Domain.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
const Domain zlib_domain("zlib");
GzipOutputStream::GzipOutputStream(OutputStream &_next, Error &error) GzipOutputStream::GzipOutputStream(OutputStream &_next, Error &error)
:next(_next) :next(_next)
{ {

2
src/fs/io/GzipOutputStream.hxx
View File

@ -29,8 +29,6 @@
class Error; class Error;
class Domain; class Domain;
extern const Domain zlib_domain;
/** /**
* A filter that compresses data written to it using zlib, forwarding * A filter that compresses data written to it using zlib, forwarding
* compressed data in the "gzip" format. * compressed data in the "gzip" format.

24
src/lib/zlib/Domain.cxx Normal file
View File

@ -0,0 +1,24 @@
/*
* Copyright (C) 2003-2014 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 "Domain.hxx"
#include "util/Domain.hxx"
const Domain zlib_domain("zlib");

27
src/lib/zlib/Domain.hxx Normal file
View File

@ -0,0 +1,27 @@
/*
* Copyright (C) 2003-2014 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_ZLIB_DOMAIN_HXX
#define MPD_ZLIB_DOMAIN_HXX
class Domain;
extern const Domain zlib_domain;
#endif