Changeset cf2af94 in mainline for uspace/lib/net/tl/socket_core.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/lib/net/tl/socket_core.c (modified) (4 diffs)

uspace/lib/net/tl/socket_core.c

@@ -161 +161 @@
 static int
 socket_port_add_core(socket_port_t *socket_port, socket_core_t *socket,
-    const char *key, size_t key_length)
+    const uint8_t *key, size_t key_length)
 {
         socket_core_t **socket_ref;
@@ -216 +216 @@
                 goto fail;
         
-        rc = socket_port_add_core(socket_port, socket, SOCKET_MAP_KEY_LISTENING,
-            0);
+        rc = socket_port_add_core(socket_port, socket,
+            (const uint8_t *) SOCKET_MAP_KEY_LISTENING, 0);
         if (rc != EOK)
                 goto fail;
@@ -602 +602 @@
  */
 socket_core_t *
-socket_port_find(socket_ports_t *global_sockets, int port, const char *key,
+socket_port_find(socket_ports_t *global_sockets, int port, const uint8_t *key,
     size_t key_length)
 {
@@ -680 +680 @@
 int
 socket_port_add(socket_ports_t *global_sockets, int port,
-    socket_core_t *socket, const char *key, size_t key_length)
+    socket_core_t *socket, const uint8_t *key, size_t key_length)
 {
         socket_port_t *socket_port;