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

refcount: convert to C++

Browse Source
This commit is contained in:
Max Kellermann
2013-01-29 23:20:19 +01:00
parent fa34dd7bd3
commit ba51045d9e
6 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/archive/Bzip2ArchivePlugin.cxx
View File

@@ -29,7 +29,7 @@
#include "InputInternal.hxx"
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "refcount.h"
#include "util/RefCount.hxx"
#include <stdint.h>
#include <stddef.h>
@@ -45,18 +45,17 @@
struct Bzip2ArchiveFile {
struct archive_file base;
struct refcount ref;
RefCount ref;
char *name;
struct input_stream *istream;
Bzip2ArchiveFile() {
archive_file_init(&base, &bz2_archive_plugin);
refcount_init(&ref);
}
void Unref() {
if (!refcount_dec(&ref))
if (!ref.Decrement())
return;
g_free(name);
@@ -174,7 +173,7 @@ Bzip2InputStream::Bzip2InputStream(Bzip2ArchiveFile &_context, const char *uri,
:base(bz2_inputplugin, uri, mutex, cond),
archive(&_context), eof(false)
{
refcount_inc(&archive->ref);
archive->ref.Increment();
}
Bzip2InputStream::~Bzip2InputStream()

9
src/archive/Iso9660ArchivePlugin.cxx
View File

@@ -29,7 +29,7 @@
#include "InputInternal.hxx"
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "refcount.h"
#include "util/RefCount.hxx"
#include <cdio/cdio.h>
#include <cdio/iso9660.h>
@@ -44,14 +44,13 @@
struct Iso9660ArchiveFile {
struct archive_file base;
struct refcount ref;
RefCount ref;
iso9660_t *iso;
Iso9660ArchiveFile(iso9660_t *_iso)
:iso(_iso) {
archive_file_init(&base, &iso9660_archive_plugin);
refcount_init(&ref);
}
~Iso9660ArchiveFile() {
@@ -59,7 +58,7 @@ struct Iso9660ArchiveFile {
}
void Unref() {
if (refcount_dec(&ref))
if (ref.Decrement())
delete this;
}
@@ -161,7 +160,7 @@ struct Iso9660InputStream {
base.ready = true;
base.size = statbuf->size;
refcount_inc(&archive->ref);
archive->ref.Increment();
}
~Iso9660InputStream() {

9
src/archive/ZzipArchivePlugin.cxx
View File

@@ -29,7 +29,7 @@
#include "InputInternal.hxx"
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "refcount.h"
#include "util/RefCount.hxx"
#include <zzip/zzip.h>
#include <glib.h>
@@ -38,17 +38,16 @@
struct ZzipArchiveFile {
struct archive_file base;
struct refcount ref;
RefCount ref;
ZZIP_DIR *dir;
ZzipArchiveFile() {
archive_file_init(&base, &zzip_archive_plugin);
refcount_init(&ref);
}
void Unref() {
if (!refcount_dec(&ref))
if (!ref.Decrement())
return;
//close archive
@@ -136,7 +135,7 @@ struct ZzipInputStream {
zzip_file_stat(file, &z_stat);
base.size = z_stat.st_size;
refcount_inc(&archive->ref);
archive->ref.Increment();
}
~ZzipInputStream() {