Changeset ad7a6c9 in mainline for uspace/srv/ns/service.c

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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:

Merge mainline changes

File:

• uspace/srv/ns/service.c (modified) (5 diffs)

uspace/srv/ns/service.c

@@ -43 +43 @@
 typedef struct {
         link_t link;
-        sysarg_t service;        /**< Number of the service. */
+        sysarg_t service;        /**< Service ID. */
         sysarg_t phone;          /**< Phone registered with the service. */
         sysarg_t in_phone_hash;  /**< Incoming phone hash. */
@@ -56 +56 @@
  *
  */
-static hash_index_t service_hash(unsigned long *key)
+static hash_index_t service_hash(unsigned long key[])
 {
         assert(key);
-        return (*key % SERVICE_HASH_TABLE_CHAINS);
+        return (key[0] % SERVICE_HASH_TABLE_CHAINS);
 }
 
@@ -86 +86 @@
         
         if (keys == 2)
-                return (key[1] == hs->in_phone_hash);
+                return ((key[0] == hs->service) && (key[1] == hs->in_phone_hash));
         else
                 return (key[0] == hs->service);
@@ -195 +195 @@
         hash_table_insert(&service_hash_table, keys, &hs->link);
         
-        return 0;
+        return EOK;
 }
 
@@ -227 +227 @@
                         }
                         
+                        link_initialize(&pr->link);
                         pr->service = service;
                         pr->callid = callid;