Merge remote-tracking branches 'neheb/uniq', 'neheb/bool', 'neheb/loop', 'neheb/bool2', 'neheb/perf', 'neheb/void' and 'neheb/value'
This commit is contained in:
@@ -73,7 +73,7 @@ archive_plugin_from_name(const char *name) noexcept
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void archive_plugin_init_all(void)
|
||||
void archive_plugin_init_all()
|
||||
{
|
||||
for (unsigned i = 0; archive_plugins[i] != nullptr; ++i) {
|
||||
const ArchivePlugin *plugin = archive_plugins[i];
|
||||
|
@@ -32,6 +32,7 @@
|
||||
#include <bzlib.h>
|
||||
|
||||
#include <stdexcept>
|
||||
#include <utility>
|
||||
|
||||
class Bzip2ArchiveFile final : public ArchiveFile {
|
||||
std::string name;
|
||||
@@ -65,7 +66,7 @@ class Bzip2InputStream final : public InputStream {
|
||||
char buffer[5000];
|
||||
|
||||
public:
|
||||
Bzip2InputStream(const std::shared_ptr<InputStream> &_input,
|
||||
Bzip2InputStream(std::shared_ptr<InputStream> _input,
|
||||
const char *uri,
|
||||
Mutex &mutex);
|
||||
~Bzip2InputStream() override;
|
||||
@@ -111,11 +112,11 @@ bz2_open(Path pathname)
|
||||
|
||||
/* single archive handling */
|
||||
|
||||
Bzip2InputStream::Bzip2InputStream(const std::shared_ptr<InputStream> &_input,
|
||||
Bzip2InputStream::Bzip2InputStream(std::shared_ptr<InputStream> _input,
|
||||
const char *_uri,
|
||||
Mutex &_mutex)
|
||||
:InputStream(_uri, _mutex),
|
||||
input(_input)
|
||||
input(std::move(_input))
|
||||
{
|
||||
Open();
|
||||
}
|
||||
|
@@ -34,6 +34,8 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <utility>
|
||||
|
||||
#define CEILING(x, y) ((x+(y-1))/y)
|
||||
|
||||
struct Iso9660 {
|
||||
@@ -141,12 +143,12 @@ class Iso9660InputStream final : public InputStream {
|
||||
iso9660_stat_t *statbuf;
|
||||
|
||||
public:
|
||||
Iso9660InputStream(const std::shared_ptr<Iso9660> &_iso,
|
||||
Iso9660InputStream(std::shared_ptr<Iso9660> _iso,
|
||||
const char *_uri,
|
||||
Mutex &_mutex,
|
||||
iso9660_stat_t *_statbuf)
|
||||
:InputStream(_uri, _mutex),
|
||||
iso(_iso), statbuf(_statbuf) {
|
||||
iso(std::move(_iso)), statbuf(_statbuf) {
|
||||
size = statbuf->size;
|
||||
seekable = true;
|
||||
SetReady();
|
||||
|
Reference in New Issue
Block a user