diff options
| author | neal <neal> | 2008-06-24 14:40:59 +0000 |
|---|---|---|
| committer | neal <neal> | 2008-06-24 14:40:59 +0000 |
| commit | 0d99d4c662383e345a7eb4bf37918eb1c39b3bc1 (patch) | |
| tree | 30f5218bc79a0321b4a703297b912a597f1a560f /viengoos | |
| parent | 25e777a0e6657a7cb9b976c87191c7055e8a98df (diff) | |
2008-06-24 Neal H. Walfield <neal@gnu.org>
* viengoos.c (main): Move assert from here...
* object.c (object_init): ... to here. Use build_asserts, not
asserts to check object sizes.
Diffstat (limited to 'viengoos')
| -rw-r--r-- | viengoos/ChangeLog | 6 | ||||
| -rw-r--r-- | viengoos/object.c | 11 | ||||
| -rw-r--r-- | viengoos/viengoos.c | 3 |
3 files changed, 12 insertions, 8 deletions
diff --git a/viengoos/ChangeLog b/viengoos/ChangeLog index 0abf20a..d43a8be 100644 --- a/viengoos/ChangeLog +++ b/viengoos/ChangeLog @@ -1,5 +1,11 @@ 2008-06-24 Neal H. Walfield <neal@gnu.org> + * viengoos.c (main): Move assert from here... + * object.c (object_init): ... to here. Use build_asserts, not + asserts to check object sizes. + +2008-06-24 Neal H. Walfield <neal@gnu.org> + * server.c (server_loop): In object_discarded_clear implementation, if the capability is weak, return EPERM. diff --git a/viengoos/object.c b/viengoos/object.c index b69c692..f5708f7 100644 --- a/viengoos/object.c +++ b/viengoos/object.c @@ -60,11 +60,12 @@ static struct hurd_ihash objects; void object_init (void) { - assertx (sizeof (struct folio) <= PAGESIZE, "%d", sizeof (struct folio)); - assertx (sizeof (struct activity) <= PAGESIZE, - "%d", sizeof (struct activity)); - assertx (sizeof (struct object) <= PAGESIZE, "%d", sizeof (struct object)); - assertx (sizeof (struct thread) <= PAGESIZE, "%d", sizeof (struct thread)); + build_assert (sizeof (struct folio) <= PAGESIZE); + build_assert (sizeof (struct activity) <= PAGESIZE); + build_assert (sizeof (struct object) <= PAGESIZE); + build_assert (sizeof (struct thread) <= PAGESIZE); + /* Assert that the size of a cap is a power of 2. */ + build_assert ((sizeof (struct cap) & (sizeof (struct cap) - 1)) == 0); /* Allocate object hash. */ diff --git a/viengoos/viengoos.c b/viengoos/viengoos.c index 0614fea..bb0cd9c 100644 --- a/viengoos/viengoos.c +++ b/viengoos/viengoos.c @@ -270,9 +270,6 @@ main (int argc, char *argv[]) "Reread the README."); debug (1, "%s " PACKAGE_VERSION " (%x)", program_name, l4_my_global_id ()); - /* Assert that the size of a cap is a power of 2. */ - assert ((sizeof (struct cap) & (sizeof (struct cap) - 1)) == 0); - /* Reserve the rm binary. */ if (! memory_reserve ((l4_word_t) &_start, (l4_word_t) &_end, memory_reservation_self)) |