Free memory with dbus_free instead of free. Account for NULL signatures.
[dbus-cxx-async.git] / src / types.cpp
blob28f36045da4079ac0fffa72be0f34e9c183798b3
1 /*
3 * D-Bus++ - C++ bindings for D-Bus
5 * Copyright (C) 2005-2009 Paolo Durante <shackan@gmail.com>
8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either
11 * version 2.1 of the License, or (at your option) any later version.
13 * This library is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Lesser General Public License for more details.
18 * You should have received a copy of the GNU Lesser General Public
19 * License along with this library; if not, write to the Free Software
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 #ifdef HAVE_CONFIG_H
25 #include <config.h>
26 #endif
28 #include <dbus-c++/types.h>
29 #include <dbus-c++/object.h>
30 #include <dbus/dbus.h>
31 #include <cstdlib>
32 #include <stdarg.h>
34 #include "message_p.h"
35 #include "internalerror.h"
37 using namespace DBus;
39 Variant::Variant()
40 : _msg(CallMessage()) // dummy message used as temporary storage for variant data
44 Variant::Variant(MessageIter &it)
45 : _msg(CallMessage())
47 MessageIter vi = it.recurse();
48 MessageIter mi = _msg.writer();
49 vi.copy_data(mi);
52 Variant &Variant::operator = (const Variant &v)
54 if (&v != this)
56 _msg = v._msg;
58 return *this;
61 void Variant::clear()
63 CallMessage empty;
64 _msg = empty;
67 const Signature Variant::signature() const
69 char *sigbuf = reader().signature();
71 // Copy the signature
72 Signature signature;
73 if ( 0 != sigbuf )
75 signature = std::string(sigbuf);
76 dbus_free(sigbuf);
79 return signature;
82 MessageIter &operator << (MessageIter &iter, const Variant &val)
84 const Signature sig = val.signature();
86 MessageIter rit = val.reader();
87 MessageIter wit = iter.new_variant(sig.c_str());
89 rit.copy_data(wit);
91 iter.close_container(wit);
93 return iter;
96 MessageIter &operator >> (MessageIter &iter, Variant &val)
98 if (iter.type() != DBUS_TYPE_VARIANT)
99 throw ErrorInvalidArgs("variant type expected");
101 val.clear();
103 MessageIter vit = iter.recurse();
104 MessageIter mit = val.writer();
106 vit.copy_data(mit);
108 return ++iter;