Adapt components to upcoming release 16.08

This commit is contained in:
Christian Helmuth
2016-08-26 13:22:51 +02:00
committed by Norman Feske
parent da743cced4
commit a578c3946e
4 changed files with 6 additions and 4 deletions

View File

@@ -17,6 +17,7 @@
#include <base/attached_dataspace.h> #include <base/attached_dataspace.h>
#include <root/component.h> #include <root/component.h>
#include <base/component.h> #include <base/component.h>
#include <base/heap.h>
#include <base/log.h> #include <base/log.h>
@@ -220,4 +221,4 @@ void Component::construct(Genode::Env &env)
static Genode::Sliced_heap sliced_heap(env.ram(), env.rm()); static Genode::Sliced_heap sliced_heap(env.ram(), env.rm());
static Fb_scaler::Root_component root(env, sliced_heap); static Fb_scaler::Root_component root(env, sliced_heap);
} }

View File

@@ -92,7 +92,7 @@ struct Input::Remap
if ((from == "") || (to == "")) { if ((from == "") || (to == "")) {
char tmp[128]; char tmp[128];
strncpy(tmp, node.addr(), min(sizeof(tmp), node.size()+1)); strncpy(tmp, node.addr(), min(sizeof(tmp), node.size()+1));
error("ignoring mapping '", tmp, "'"); error("ignoring mapping '", Cstring(tmp), "'");
return; return;
} }

View File

@@ -16,6 +16,7 @@
#include <root/component.h> #include <root/component.h>
#include <base/component.h> #include <base/component.h>
#include <base/session_label.h> #include <base/session_label.h>
#include <base/heap.h>
#include <base/log.h> #include <base/log.h>
#include <base/snprintf.h> #include <base/snprintf.h>
#include <util/list.h> #include <util/list.h>
@@ -106,4 +107,4 @@ void Component::construct(Genode::Env &env)
static Log_tee::Root_component root(env, heap); static Log_tee::Root_component root(env, heap);
env.parent().announce(env.ep().manage(root)); env.parent().announce(env.ep().manage(root));
} }

View File

@@ -112,7 +112,7 @@ static uSynergyBool connect(uSynergyCookie cookie)
sockaddr.sin_family = AF_INET; sockaddr.sin_family = AF_INET;
sockaddr.sin_port = htons(port); sockaddr.sin_port = htons(port);
if (inet_pton(AF_INET, addr, &sockaddr.sin_addr.s_addr) == 0) { if (inet_pton(AF_INET, addr, &sockaddr.sin_addr.s_addr) == 0) {
Genode::error("bad IPv4 address ", addr, " for server"); Genode::error("bad IPv4 address ", Cstring(addr), " for server");
return USYNERGY_FALSE; return USYNERGY_FALSE;
} }