fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-08 03:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Moved Bencode stream functions to object_stream.h and the Bencode

Browse Source 
class to object.h.

* torrent::download_add(...) now takes an torrent::Object*.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@653 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2006-03-20 21:03:42 +00:00
parent 86a3f868df
commit 17d66c4a2f
12 changed files with 83 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/variable_generic.cc
+20 -20
View File
@@ -45,40 +45,40 @@ namespace utils {
VariableAny::~VariableAny() {
}
const torrent::Bencode&
const torrent::Object&
VariableAny::get() {
return m_variable;
}
void
VariableAny::set(const torrent::Bencode& arg) {
VariableAny::set(const torrent::Object& arg) {
m_variable = arg;
}
VariableValue::~VariableValue() {
}
const torrent::Bencode&
const torrent::Object&
VariableValue::get() {
return m_variable;
}
void
VariableValue::set(const torrent::Bencode& arg) {
VariableValue::set(const torrent::Object& arg) {
uint64_t value;
const char* first;
char* last;
switch (arg.get_type()) {
case torrent::Bencode::TYPE_NONE:
switch (arg.type()) {
case torrent::Object::TYPE_NONE:
m_variable = (int64_t)0;
break;
case torrent::Bencode::TYPE_VALUE:
case torrent::Object::TYPE_VALUE:
m_variable = arg;
break;
case torrent::Bencode::TYPE_STRING:
case torrent::Object::TYPE_STRING:
first = arg.as_string().c_str();
value = strtoll(first, &last, 0);
@@ -96,13 +96,13 @@ VariableValue::set(const torrent::Bencode& arg) {
VariableBool::~VariableBool() {
}
const torrent::Bencode&
const torrent::Object&
VariableBool::get() {
return m_variable;
}
void
VariableBool::set(const torrent::Bencode& arg) {
VariableBool::set(const torrent::Object& arg) {
if (arg.is_value()) {
m_variable = arg.as_value() ? (int64_t)1 : (int64_t)0;
@@ -124,11 +124,11 @@ VariableBool::set(const torrent::Bencode& arg) {
}
}
VariableBencode::~VariableBencode() {
VariableObject::~VariableObject() {
}
const torrent::Bencode&
VariableBencode::get() {
const torrent::Object&
VariableObject::get() {
if (m_root.empty())
return m_bencode->get_key(m_key);
else
@@ -136,9 +136,9 @@ VariableBencode::get() {
}
void
VariableBencode::set(const torrent::Bencode& arg) {
VariableObject::set(const torrent::Object& arg) {
// Consider removing if TYPE_NONE.
torrent::Bencode* root;
torrent::Object* root;
if (m_root.empty())
root = m_bencode;
@@ -146,20 +146,20 @@ VariableBencode::set(const torrent::Bencode& arg) {
root = &m_bencode->get_key(m_root);
switch (m_type) {
case torrent::Bencode::TYPE_NONE:
case torrent::Object::TYPE_NONE:
root->insert_key(m_key, arg);
break;
case torrent::Bencode::TYPE_STRING:
if (arg.get_type() == torrent::Bencode::TYPE_STRING)
case torrent::Object::TYPE_STRING:
if (arg.type() == torrent::Object::TYPE_STRING)
root->insert_key(m_key, arg);
else
throw torrent::input_error("VariableBencode could not convert to string.");
throw torrent::input_error("VariableObject could not convert to string.");
break;
default:
throw torrent::input_error("VariableBencode unsupported type restriction.");
throw torrent::input_error("VariableObject unsupported type restriction.");
}
}