update

[l4.git] / l4 / pkg / moe / server / src / name_space.cc

diff --git a/l4/pkg/moe/server/src/name_space.cc b/l4/pkg/moe/server/src/name_space.cc
index b44c5ca91a4f65512027f49f12617a57fa78c3ab..dbb0272bd39ce5c841133f74df326114a277dbbe 100644 (file)
--- a/l4/pkg/moe/server/src/name_space.cc
+++ b/l4/pkg/moe/server/src/name_space.cc
@@ -71,21 +71,18 @@ Name_space::alloc_dynamic_entry(Names::Name const &name, unsigned flags)
   if (e)
     return e;
 
-  free(na);
-
   return 0;
 }
 
 void
 Name_space::free_dynamic_entry(Names::Entry *n)
 {
-  free(const_cast<char*>(n->name().start()));
   assert (!n->next_link());
   delete static_cast<Moe::Entry*>(n);
 }
 
 int
-Name_space::get_capability(L4::Snd_fpage const &cap_fp, L4::Cap<void> *cap,
+Name_space::get_capability(L4::Ipc::Snd_fpage const &cap_fp, L4::Cap<void> *cap,
                            L4::Server_object **lo)
 {
   L4::Cap<void> rcv_cap(Rcv_cap << L4_CAP_SHIFT);
@@ -94,10 +91,10 @@ Name_space::get_capability(L4::Snd_fpage const &cap_fp, L4::Cap<void> *cap,
     {
       L4::Server_object *o = object_pool.find(cap_fp.data());
       if (!o)
-       return -L4_EINVAL;
+        return -L4_EINVAL;
 
       if (lo)
-       *lo = o;
+        *lo = o;
 
       *cap = o->obj_cap();
       return 0;
@@ -146,14 +143,14 @@ Name_space::dump(bool rec, int indent) const
   for (Const_iterator i = begin(); i != end(); ++i)
     {
       for (int x = 0; x < indent; ++x)
-       L4::cout << "  ";
+        L4::cout << "  ";
 
       L4::cout << "  " << i->name()  << " -> " << i->obj()->cap()
                << " o=" << (void*)i->obj()->obj()  << " f="
                << i->obj()->flags() << '\n';
-      if (rec && i->obj()->is_valid() 
-         && (n = dynamic_cast<Name_space const *>(i->obj()->obj())))
-       n->dump(rec, indent + 1);
+      if (rec && i->obj()->is_valid()
+          && (n = dynamic_cast<Name_space const *>(i->obj()->obj())))
+        n->dump(rec, indent + 1);
     }
 }