hurd-l4/libhurd-cap cap-user.c cap.c cap.h

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd-l4
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/08/16 16:15:43

Modified files:
        libhurd-cap    : cap-user.c cap.c cap.h 

Log message:
        Fix a couple of bugs.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libhurd-cap/cap-user.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libhurd-cap/cap.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libhurd-cap/cap.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: hurd-l4/libhurd-cap/cap-user.c
diff -u hurd-l4/libhurd-cap/cap-user.c:1.1 hurd-l4/libhurd-cap/cap-user.c:1.2
--- hurd-l4/libhurd-cap/cap-user.c:1.1  Sat Aug 16 15:46:16 2003
+++ hurd-l4/libhurd-cap/cap-user.c      Sat Aug 16 16:15:43 2003
@@ -20,6 +20,9 @@
 
 #include <stdlib.h>
 #include <pthread.h>
+#include <assert.h>
+#include <errno.h>
+#include <error.h>
 
 #include <hurd/cap.h>
 
@@ -162,11 +165,9 @@
          return err;
        }
 
-      cap->srefs = 0;
       cap->sconn = sconn;
       cap->scid = scid;
       cap->dead_cb = NULL;
-      cap->orefs = 0;
 
       err = hurd_ihash_enter (sconn->id_to_cap, scid, cap);
       if (err)
Index: hurd-l4/libhurd-cap/cap.c
diff -u hurd-l4/libhurd-cap/cap.c:1.1 hurd-l4/libhurd-cap/cap.c:1.2
--- hurd-l4/libhurd-cap/cap.c:1.1       Sat Aug 16 15:46:16 2003
+++ hurd-l4/libhurd-cap/cap.c   Sat Aug 16 16:15:43 2003
@@ -19,6 +19,9 @@
    02111-1307 USA.  */
 
 #include <stdlib.h>
+#include <assert.h>
+#include <error.h>
+
 #include <pthread.h>
 
 #include <hurd/cap.h>
@@ -26,6 +29,7 @@
 #include "cap-intern.h"
 
 
+/* The slab space for capability objects.  */
 hurd_slab_space_t cap_space;
 
 
@@ -66,12 +70,8 @@
 error_t
 hurd_cap_init (void)
 {
-  error_t err;
-
-  err = hurd_slab_space_create (&cap_space, cap_constructor,
-                               cap_deconstructor);
-  if (err)
-    return err;
+  return hurd_slab_create (sizeof (struct hurd_cap),
+                          cap_constructor, cap_deconstructor, &cap_space);
 }
 
 
@@ -143,7 +143,7 @@
     {
       /* Return the capability to the pool.  */
       pthread_mutex_unlock (&cap->lock);
-      hurd_slab_dealloc (cap_space, cap);
+      hurd_slab_dealloc (cap_space, (void *) cap);
     }
   else
     pthread_mutex_unlock (&cap->lock);
@@ -220,7 +220,7 @@
     {
       /* Return the capability to the pool.  */
       pthread_mutex_unlock (&cap->lock);
-      hurd_slab_dealloc (cap_space, cap);
+      hurd_slab_dealloc (cap_space, (void *) cap);
     }
   else
     pthread_mutex_unlock (&cap->lock);
Index: hurd-l4/libhurd-cap/cap.h
diff -u hurd-l4/libhurd-cap/cap.h:1.1 hurd-l4/libhurd-cap/cap.h:1.2
--- hurd-l4/libhurd-cap/cap.h:1.1       Sat Aug 16 15:46:16 2003
+++ hurd-l4/libhurd-cap/cap.h   Sat Aug 16 16:15:43 2003
@@ -19,6 +19,7 @@
    02111-1307 USA.  */
 
 #include <pthread.h>
+#include <error.h>
 
 #include <hurd/ihash.h>
 #include <hurd/slab.h>