jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Use standard types instead of typedefs wherever possible

Browse source
This commit is contained in:
pd 2008-08-09 01:16:45 +02:00
parent efc594f888
commit f0a9278511
12 changed files with 90 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

18
examples/echo/echo-server.cpp
View file

@ -13,12 +13,12 @@ EchoServer::EchoServer(DBus::Connection &connection)
{
}
DBus::Int32 EchoServer::Random()
int32_t EchoServer::Random()
{
return rand();
}
DBus::String EchoServer::Hello(const DBus::String &name)
std::string EchoServer::Hello(const std::string &name)
{
sleep (10);
return "Hello " + name + "!";
@ -31,33 +31,33 @@ DBus::Variant EchoServer::Echo(const DBus::Variant &value)
return value;
}
std::vector< DBus::Byte > EchoServer::Cat(const DBus::String &file)
std::vector< uint8_t > EchoServer::Cat(const std::string &file)
{
FILE *handle = fopen(file.c_str(), "rb");
if (!handle) throw DBus::Error("org.freedesktop.DBus.EchoDemo.ErrorFileNotFound", "file not found");
DBus::Byte buff[1024];
uint8_t buff[1024];
size_t nread = fread(buff, 1, sizeof(buff), handle);
fclose(handle);
return std::vector< DBus::Byte > (buff, buff + nread);
return std::vector< uint8_t > (buff, buff + nread);
}
DBus::Int32 EchoServer::Sum(const std::vector<DBus::Int32>& ints)
int32_t EchoServer::Sum(const std::vector<int32_t>& ints)
{
DBus::Int32 sum = 0;
int32_t sum = 0;
for (size_t i = 0; i < ints.size(); ++i) sum += ints[i];
return sum;
}
std::map< DBus::String, DBus::String > EchoServer::Info()
std::map< std::string, std::string > EchoServer::Info()
{
std::map< DBus::String, DBus::String > info;
std::map< std::string, std::string > info;
char hostname[HOST_NAME_MAX];
gethostname(hostname, sizeof(hostname));