Changeset bc73be3 in mainline for kernel/generic/src/cap/cap.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cpp: merge and resolve conflicts

File:

• kernel/generic/src/cap/cap.c (modified) (4 diffs)

kernel/generic/src/cap/cap.c

@@ -98 +98 @@
 {
         cap_t *cap = hash_table_get_inst(item, cap_t, caps_link);
-        return hash_mix(CAP_HANDLE_RAW(cap->handle));
-}
-
-static size_t caps_key_hash(void *key)
-{
-        cap_handle_t *handle = (cap_handle_t *) key;
-        return hash_mix(CAP_HANDLE_RAW(*handle));
-}
-
-static bool caps_key_equal(void *key, const ht_link_t *item)
-{
-        cap_handle_t *handle = (cap_handle_t *) key;
+        return hash_mix(cap_handle_raw(cap->handle));
+}
+
+static size_t caps_key_hash(const void *key)
+{
+        const cap_handle_t *handle = key;
+        return hash_mix(cap_handle_raw(*handle));
+}
+
+static bool caps_key_equal(const void *key, const ht_link_t *item)
+{
+        const cap_handle_t *handle = key;
         cap_t *cap = hash_table_get_inst(item, cap_t, caps_link);
         return *handle == cap->handle;
@@ -232 +232 @@
         assert(mutex_locked(&task->cap_info->lock));
 
-        if ((CAP_HANDLE_RAW(handle) < CAPS_START) ||
-            (CAP_HANDLE_RAW(handle) > CAPS_LAST))
+        if ((cap_handle_raw(handle) < CAPS_START) ||
+            (cap_handle_raw(handle) > CAPS_LAST))
                 return NULL;
         ht_link_t *link = hash_table_find(&task->cap_info->caps, &handle);
@@ -383 +383 @@
 void cap_free(task_t *task, cap_handle_t handle)
 {
-        assert(CAP_HANDLE_RAW(handle) >= CAPS_START);
-        assert(CAP_HANDLE_RAW(handle) <= CAPS_LAST);
+        assert(cap_handle_raw(handle) >= CAPS_START);
+        assert(cap_handle_raw(handle) <= CAPS_LAST);
 
         mutex_lock(&task->cap_info->lock);
@@ -392 +392 @@
 
         hash_table_remove_item(&task->cap_info->caps, &cap->caps_link);
-        ra_free(task->cap_info->handles, CAP_HANDLE_RAW(handle), 1);
+        ra_free(task->cap_info->handles, cap_handle_raw(handle), 1);
         slab_free(cap_cache, cap);
         mutex_unlock(&task->cap_info->lock);