Changeset a7811f17 in mainline for uspace/lib

Timestamp:

2010-11-19T21:28:02Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a9c6b966

Parents:

45f04f8 (diff), aaa3f33a (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 xxx_ref typedefs removal.

Location:

uspace/lib

Files:

• c/generic/adt/char_map.c (modified) (12 diffs)
• c/generic/adt/dynamic_fifo.c (modified) (6 diffs)
• c/generic/adt/measured_strings.c (modified) (10 diffs)
• c/generic/net/packet.c (modified) (5 diffs)
• c/generic/net/socket_client.c (modified) (17 diffs)
• c/include/adt/char_map.h (modified) (2 diffs)
• c/include/adt/dynamic_fifo.h (modified) (2 diffs)
• c/include/adt/generic_char_map.h (modified) (9 diffs)
• c/include/adt/generic_field.h (modified) (8 diffs)
• c/include/adt/int_map.h (modified) (14 diffs)
• c/include/adt/measured_strings.h (modified) (2 diffs)
• c/include/net/device.h (modified) (1 diff)
• c/include/net/packet.h (modified) (1 diff)
• net/adt/module_map.c (modified) (2 diffs)
• net/generic/generic.c (modified) (3 diffs)
• net/generic/net_remote.c (modified) (3 diffs)
• net/generic/packet_remote.c (modified) (2 diffs)
• net/il/arp_remote.c (modified) (3 diffs)
• net/il/ip_client.c (modified) (8 diffs)
• net/il/ip_remote.c (modified) (1 diff)
• net/include/adt/module_map.h (modified) (2 diffs)
• net/include/arp_interface.h (modified) (1 diff)
• net/include/generic.h (modified) (2 diffs)
• net/include/icmp_header.h (modified) (2 diffs)
• net/include/ip_header.h (modified) (2 diffs)
• net/include/ip_remote.h (modified) (1 diff)
• net/include/net_interface.h (modified) (1 diff)
• net/include/netif_local.h (modified) (3 diffs)
• net/include/netif_remote.h (modified) (2 diffs)
• net/include/packet_remote.h (modified) (1 diff)
• net/include/socket_core.h (modified) (3 diffs)
• net/include/tl_common.h (modified) (1 diff)
• net/netif/netif_local.c (modified) (3 diffs)
• net/netif/netif_remote.c (modified) (2 diffs)
• net/tl/icmp_client.c (modified) (1 diff)
• net/tl/socket_core.c (modified) (14 diffs)
• net/tl/tl_common.c (modified) (3 diffs)
• packet/generic/packet_server.c (modified) (1 diff)
• packet/include/packet_local.h (modified) (1 diff)

uspace/lib/c/generic/adt/char_map.c

@@ -65 +65 @@
  */
 static int
-char_map_add_item(char_map_ref map, const char *identifier, size_t length,
+char_map_add_item(char_map_t *map, const char *identifier, size_t length,
     const int value)
 {
         if (map->next == (map->size - 1)) {
-                char_map_ref *tmp;
-
-                tmp = (char_map_ref *) realloc(map->items,
-                    sizeof(char_map_ref) * 2 * map->size);
+                char_map_t **tmp;
+
+                tmp = (char_map_t **) realloc(map->items,
+                    sizeof(char_map_t *) * 2 * map->size);
                 if (!tmp)
                         return ENOMEM;
@@ -80 +80 @@
         }
 
-        map->items[map->next] = (char_map_ref) malloc(sizeof(char_map_t));
+        map->items[map->next] = (char_map_t *) malloc(sizeof(char_map_t));
         if (!map->items[map->next])
                 return ENOMEM;
@@ -110 +110 @@
  * @returns             FALSE otherwise.
  */
-static int char_map_is_valid(const char_map_ref map)
+static int char_map_is_valid(const char_map_t *map)
 {
         return map && (map->magic == CHAR_MAP_MAGIC_VALUE);
@@ -139 +139 @@
  */
 int
-char_map_add(char_map_ref map, const char *identifier, size_t length,
+char_map_add(char_map_t *map, const char *identifier, size_t length,
     const int value)
 {
@@ -172 +172 @@
  * @param[in,out] map   The character string to integer map.
  */
-void char_map_destroy(char_map_ref map)
+void char_map_destroy(char_map_t *map)
 {
         if (char_map_is_valid(map)) {
@@ -200 +200 @@
  * @returns             NULL if the key is not assigned a node.
  */
-static char_map_ref
-char_map_find_node(const char_map_ref map, const char *identifier,
+static char_map_t *
+char_map_find_node(const char_map_t *map, const char *identifier,
     size_t length)
 {
@@ -224 +224 @@
         }
 
-        return map;
+        return (char_map_t *) map;
 }
 
@@ -242 +242 @@
  * @returns             CHAR_MAP_NULL if the key is not assigned a value.
  */
-int char_map_exclude(char_map_ref map, const char *identifier, size_t length)
-{
-        char_map_ref node;
+int char_map_exclude(char_map_t *map, const char *identifier, size_t length)
+{
+        char_map_t *node;
 
         node = char_map_find_node(map, identifier, length);
@@ -270 +270 @@
  *  @returns            CHAR_MAP_NULL if the key is not assigned a value.
  */
-int char_map_find(const char_map_ref map, const char *identifier, size_t length)
-{
-        char_map_ref node;
+int char_map_find(const char_map_t *map, const char *identifier, size_t length)
+{
+        char_map_t *node;
 
         node = char_map_find_node(map, identifier, length);
@@ -285 +285 @@
  *  @returns            ENOMEM if there is not enough memory left.
  */
-int char_map_initialize(char_map_ref map)
+int char_map_initialize(char_map_t *map)
 {
         if (!map)
@@ -295 +295 @@
         map->next = 0;
 
-        map->items = malloc(sizeof(char_map_ref) * map->size);
+        map->items = malloc(sizeof(char_map_t *) * map->size);
         if (!map->items) {
                 map->magic = 0;
@@ -330 +330 @@
  */
 int
-char_map_update(char_map_ref map, const char *identifier, const size_t length,
+char_map_update(char_map_t *map, const char *identifier, const size_t length,
     const int value)
 {
-        char_map_ref node;
+        char_map_t *node;
 
         node = char_map_find_node(map, identifier, length);

uspace/lib/c/generic/adt/dynamic_fifo.c

@@ -59 +59 @@
  * @returns             FALSE otherwise.
  */
-static int dyn_fifo_is_valid(dyn_fifo_ref fifo)
+static int dyn_fifo_is_valid(dyn_fifo_t *fifo)
 {
         return fifo && (fifo->magic_value == DYN_FIFO_MAGIC_VALUE);
@@ -73 +73 @@
  * @returns             ENOMEM if there is not enough memory left.
  */
-int dyn_fifo_initialize(dyn_fifo_ref fifo, int size)
+int dyn_fifo_initialize(dyn_fifo_t *fifo, int size)
 {
         if (!fifo)
@@ -104 +104 @@
  * @returns             ENOMEM if there is not enough memory left.
  */
-int dyn_fifo_push(dyn_fifo_ref fifo, int value, int max_size)
+int dyn_fifo_push(dyn_fifo_t *fifo, int value, int max_size)
 {
         int *new_items;
@@ -154 +154 @@
  * @returns             ENOENT if the queue is empty.
  */
-int dyn_fifo_pop(dyn_fifo_ref fifo)
+int dyn_fifo_pop(dyn_fifo_t *fifo)
 {
         int value;
@@ -176 +176 @@
  * @returns             ENOENT if the queue is empty.
  */
-int dyn_fifo_value(dyn_fifo_ref fifo)
+int dyn_fifo_value(dyn_fifo_t *fifo)
 {
         if (!dyn_fifo_is_valid(fifo))
@@ -193 +193 @@
  * @returns             EINVAL if the queue is not valid.
  */
-int dyn_fifo_destroy(dyn_fifo_ref fifo)
+int dyn_fifo_destroy(dyn_fifo_t *fifo)
 {
         if (!dyn_fifo_is_valid(fifo))

uspace/lib/c/generic/adt/measured_strings.c

@@ -58 +58 @@
  * @returns             NULL if there is not enough memory left.
  */
-measured_string_ref
+measured_string_t *
 measured_string_create_bulk(const char *string, size_t length)
 {
-        measured_string_ref new;
+        measured_string_t *new;
 
         if (length == 0) {
@@ -67 +67 @@
                         length++;
         }
-        new = (measured_string_ref) malloc(sizeof(measured_string_t) +
+        new = (measured_string_t *) malloc(sizeof(measured_string_t) +
             (sizeof(char) * (length + 1)));
         if (!new)
@@ -88 +88 @@
  * @returns             NULL if there is not enough memory left.
  */
-measured_string_ref measured_string_copy(measured_string_ref source)
-{
-        measured_string_ref new;
+measured_string_t *measured_string_copy(measured_string_t *source)
+{
+        measured_string_t *new;
 
         if (!source)
                 return NULL;
 
-        new = (measured_string_ref) malloc(sizeof(measured_string_t));
+        new = (measured_string_t *) malloc(sizeof(measured_string_t));
         if (new) {
                 new->value = (char *) malloc(source->length + 1);
@@ -131 +131 @@
  */
 int
-measured_strings_receive(measured_string_ref *strings, char **data,
+measured_strings_receive(measured_string_t **strings, char **data,
     size_t count)
 {
@@ -166 +166 @@
         (*data)[lengths[count] - 1] = '\0';
 
-        *strings = (measured_string_ref) malloc(sizeof(measured_string_t) *
+        *strings = (measured_string_t *) malloc(sizeof(measured_string_t) *
             count);
         if (!*strings) {
@@ -212 +212 @@
  * @returns             NULL if there is not enough memory left.
  */
-static size_t *prepare_lengths(const measured_string_ref strings, size_t count)
+static size_t *prepare_lengths(const measured_string_t *strings, size_t count)
 {
         size_t *lengths;
@@ -248 +248 @@
  *                      async_data_read_finalize() function.
  */
-int measured_strings_reply(const measured_string_ref strings, size_t count)
+int measured_strings_reply(const measured_string_t *strings, size_t count)
 {
         size_t *lengths;
@@ -311 +311 @@
  */
 int
-measured_strings_return(int phone, measured_string_ref *strings, char **data,
+measured_strings_return(int phone, measured_string_t **strings, char **data,
     size_t count)
 {
@@ -339 +339 @@
         }
 
-        *strings = (measured_string_ref) malloc(sizeof(measured_string_t) *
+        *strings = (measured_string_t *) malloc(sizeof(measured_string_t) *
             count);
         if (!*strings) {
@@ -385 +385 @@
  */
 int
-measured_strings_send(int phone, const measured_string_ref strings,
+measured_strings_send(int phone, const measured_string_t *strings,
     size_t count)
 {

uspace/lib/c/generic/net/packet.c

@@ -64 +64 @@
 typedef packet_t packet_map_t[PACKET_MAP_SIZE];
 
-/** Type definition of the packet map page pointer. */
-typedef packet_map_t * packet_map_ref;
-
 /** Packet map.
  * Maps packet identifiers to the packet references.
@@ -109 +106 @@
 packet_t pm_find(packet_id_t packet_id)
 {
-        packet_map_ref map;
+        packet_map_t *map;
         packet_t packet;
 
@@ -140 +137 @@
 int pm_add(packet_t packet)
 {
-        packet_map_ref map;
+        packet_map_t *map;
         int rc;
 
@@ -154 +151 @@
         } else {
                 do {
-                        map = (packet_map_ref) malloc(sizeof(packet_map_t));
+                        map = (packet_map_t *) malloc(sizeof(packet_map_t));
                         if (!map) {
                                 fibril_rwlock_write_unlock(&pm_globals.lock);
@@ -180 +177 @@
         int count;
         int index;
-        packet_map_ref map;
+        packet_map_t *map;
         packet_t packet;
 

uspace/lib/c/generic/net/socket_client.c

@@ -79 +79 @@
 typedef struct socket socket_t;
 
-/** Type definition of the socket specific data pointer.
- * @see socket
- */
-typedef socket_t *socket_ref;
-
 /** Socket specific data.
  *
@@ -162 +157 @@
 
         /** Active sockets. */
-        sockets_ref sockets;
+        sockets_t *sockets;
 
         /** Safety lock.
@@ -185 +180 @@
  *  @returns            The active sockets.
  */
-static sockets_ref socket_get_sockets(void)
+static sockets_t *socket_get_sockets(void)
 {
         if (!socket_globals.sockets) {
                 socket_globals.sockets =
-                    (sockets_ref) malloc(sizeof(sockets_t));
+                    (sockets_t *) malloc(sizeof(sockets_t));
                 if (!socket_globals.sockets)
                         return NULL;
@@ -213 +208 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        socket_ref socket;
+        socket_t *socket;
         int rc;
 
@@ -332 +327 @@
 static int socket_generate_new_id(void)
 {
-        sockets_ref sockets;
+        sockets_t *sockets;
         int socket_id = 0;
         int count;
@@ -372 +367 @@
  */
 static void
-socket_initialize(socket_ref socket, int socket_id, int phone,
+socket_initialize(socket_t *socket, int socket_id, int phone,
     services_t service)
 {
@@ -405 +400 @@
 int socket(int domain, int type, int protocol)
 {
-        socket_ref socket;
+        socket_t *socket;
         int phone;
         int socket_id;
@@ -463 +458 @@
 
         // create a new socket structure
-        socket = (socket_ref) malloc(sizeof(socket_t));
+        socket = (socket_t *) malloc(sizeof(socket_t));
         if (!socket)
                 return ENOMEM;
@@ -524 +519 @@
     const void *data, size_t datalength)
 {
-        socket_ref socket;
+        socket_t *socket;
         aid_t message_id;
         ipcarg_t result;
@@ -588 +583 @@
 int listen(int socket_id, int backlog)
 {
-        socket_ref socket;
+        socket_t *socket;
         int result;
 
@@ -627 +622 @@
 int accept(int socket_id, struct sockaddr * cliaddr, socklen_t * addrlen)
 {
-        socket_ref socket;
-        socket_ref new_socket;
+        socket_t *socket;
+        socket_t *new_socket;
         aid_t message_id;
         ipcarg_t ipc_result;
@@ -661 +656 @@
 
         // create a new scoket
-        new_socket = (socket_ref) malloc(sizeof(socket_t));
+        new_socket = (socket_t *) malloc(sizeof(socket_t));
         if (!new_socket) {
                 fibril_mutex_unlock(&socket->accept_lock);
@@ -745 +740 @@
  * @param[in] socket    The socket to be destroyed.
  */
-static void socket_destroy(socket_ref socket)
+static void socket_destroy(socket_t *socket)
 {
         int accepted_id;
@@ -770 +765 @@
 int closesocket(int socket_id)
 {
-        socket_ref socket;
+        socket_t *socket;
         int rc;
 
@@ -824 +819 @@
     socklen_t addrlen)
 {
-        socket_ref socket;
+        socket_t *socket;
         aid_t message_id;
         ipcarg_t result;
@@ -981 +976 @@
     int flags, struct sockaddr *fromaddr, socklen_t *addrlen)
 {
-        socket_ref socket;
+        socket_t *socket;
         aid_t message_id;
         ipcarg_t ipc_result;
@@ -1163 +1158 @@
 getsockopt(int socket_id, int level, int optname, void *value, size_t *optlen)
 {
-        socket_ref socket;
+        socket_t *socket;
         aid_t message_id;
         ipcarg_t result;

uspace/lib/c/include/adt/char_map.h

@@ -48 +48 @@
 typedef struct char_map char_map_t;
 
-/** Type definition of the character string to integer map pointer.
- *  @see char_map
- */
-typedef char_map_t *char_map_ref;
-
 /** Character string to integer map item.
  *
@@ -69 +64 @@
         int next;
         /** Next character array. */
-        char_map_ref *items;
+        char_map_t **items;
         /** Consistency check magic value. */
         int magic;
 };
 
-extern int char_map_initialize(char_map_ref);
-extern void char_map_destroy(char_map_ref);
-extern int char_map_exclude(char_map_ref, const char *, size_t);
-extern int char_map_add(char_map_ref, const char *, size_t, const int);
-extern int char_map_find(const char_map_ref, const char *, size_t);
-extern int char_map_update(char_map_ref, const char *, size_t, const int);
+extern int char_map_initialize(char_map_t *);
+extern void char_map_destroy(char_map_t *);
+extern int char_map_exclude(char_map_t *, const char *, size_t);
+extern int char_map_add(char_map_t *, const char *, size_t, const int);
+extern int char_map_find(const char_map_t *, const char *, size_t);
+extern int char_map_update(char_map_t *, const char *, size_t, const int);
 
 #endif

uspace/lib/c/include/adt/dynamic_fifo.h

@@ -44 +44 @@
 typedef struct dyn_fifo dyn_fifo_t;
 
-/** Type definition of the dynamic fifo queue pointer.
- *  @see dyn_fifo
- */
-typedef dyn_fifo_t *dyn_fifo_ref;
-
 /** Dynamic first in first out positive integer queue.
  * Possitive integer values only.
@@ -66 +61 @@
 };
 
-extern int dyn_fifo_initialize(dyn_fifo_ref, int);
-extern int dyn_fifo_destroy(dyn_fifo_ref);
-extern int dyn_fifo_push(dyn_fifo_ref, int, int);
-extern int dyn_fifo_pop(dyn_fifo_ref);
-extern int dyn_fifo_value(dyn_fifo_ref);
+extern int dyn_fifo_initialize(dyn_fifo_t *, int);
+extern int dyn_fifo_destroy(dyn_fifo_t *);
+extern int dyn_fifo_push(dyn_fifo_t *, int, int);
+extern int dyn_fifo_pop(dyn_fifo_t *);
+extern int dyn_fifo_value(dyn_fifo_t *);
 
 #endif

uspace/lib/c/include/adt/generic_char_map.h

@@ -55 +55 @@
         \
         typedef struct name name##_t; \
-        typedef name##_t *name##_ref; \
         \
         struct  name { \
@@ -63 +62 @@
         }; \
         \
-        int name##_add(name##_ref, const char *, const size_t, type *); \
-        int name##_count(name##_ref); \
-        void name##_destroy(name##_ref); \
-        void name##_exclude(name##_ref, const char *, const size_t); \
-        type *name##_find(name##_ref, const char *, const size_t); \
-        int name##_initialize(name##_ref); \
-        int name##_is_valid(name##_ref);
+        int name##_add(name##_t *, const char *, const size_t, type *); \
+        int name##_count(name##_t *); \
+        void name##_destroy(name##_t *); \
+        void name##_exclude(name##_t *, const char *, const size_t); \
+        type *name##_find(name##_t *, const char *, const size_t); \
+        int name##_initialize(name##_t *); \
+        int name##_is_valid(name##_t *);
 
 /** Character string to generic type map implementation.
@@ -81 +80 @@
         GENERIC_FIELD_IMPLEMENT(name##_items, type) \
         \
-        int name##_add(name##_ref map, const char *name, const size_t length, \
+        int name##_add(name##_t *map, const char *name, const size_t length, \
              type *value) \
         { \
@@ -99 +98 @@
         } \
         \
-        int name##_count(name##_ref map) \
+        int name##_count(name##_t *map) \
         { \
                 return name##_is_valid(map) ? \
@@ -105 +104 @@
         } \
         \
-        void name##_destroy(name##_ref map) \
+        void name##_destroy(name##_t *map) \
         { \
                 if (name##_is_valid(map)) { \
@@ -113 +112 @@
         } \
         \
-        void name##_exclude(name##_ref map, const char *name, \
+        void name##_exclude(name##_t *map, const char *name, \
             const size_t length) \
         { \
@@ -125 +124 @@
         } \
         \
-        type *name##_find(name##_ref map, const char *name, \
+        type *name##_find(name##_t *map, const char *name, \
             const size_t length) \
         { \
@@ -138 +137 @@
         } \
         \
-        int name##_initialize(name##_ref map) \
+        int name##_initialize(name##_t *map) \
         { \
                 int rc; \
@@ -155 +154 @@
         } \
         \
-        int name##_is_valid(name##_ref map) \
+        int name##_is_valid(name##_t *map) \
         { \
                 return map && (map->magic == GENERIC_CHAR_MAP_MAGIC_VALUE); \

uspace/lib/c/include/adt/generic_field.h

@@ -53 +53 @@
 #define GENERIC_FIELD_DECLARE(name, type) \
         typedef struct name name##_t; \
-        typedef name##_t *name##_ref; \
         \
         struct  name { \
@@ -62 +61 @@
         }; \
         \
-        int name##_add(name##_ref, type *); \
-        int name##_count(name##_ref); \
-        void name##_destroy(name##_ref); \
-        void name##_exclude_index(name##_ref, int); \
-        type **name##_get_field(name##_ref); \
-        type *name##_get_index(name##_ref, int); \
-        int name##_initialize(name##_ref); \
-        int name##_is_valid(name##_ref);
+        int name##_add(name##_t *, type *); \
+        int name##_count(name##_t *); \
+        void name##_destroy(name##_t *); \
+        void name##_exclude_index(name##_t *, int); \
+        type **name##_get_field(name##_t *); \
+        type *name##_get_index(name##_t *, int); \
+        int name##_initialize(name##_t *); \
+        int name##_is_valid(name##_t *);
 
 /** Generic type field implementation.
@@ -79 +78 @@
  */
 #define GENERIC_FIELD_IMPLEMENT(name, type) \
-        int name##_add(name##_ref field, type *value) \
+        int name##_add(name##_t *field, type *value) \
         { \
                 if (name##_is_valid(field)) { \
@@ -99 +98 @@
         } \
         \
-        int name##_count(name##_ref field) \
+        int name##_count(name##_t *field) \
         { \
                 return name##_is_valid(field) ? field->next : -1; \
         } \
         \
-        void name##_destroy(name##_ref field) \
+        void name##_destroy(name##_t *field) \
         { \
                 if (name##_is_valid(field)) { \
@@ -117 +116 @@
         } \
          \
-        void name##_exclude_index(name##_ref field, int index) \
+        void name##_exclude_index(name##_t *field, int index) \
         { \
                 if (name##_is_valid(field) && (index >= 0) && \
@@ -126 +125 @@
         } \
          \
-        type *name##_get_index(name##_ref field, int index) \
+        type *name##_get_index(name##_t *field, int index) \
         { \
                 if (name##_is_valid(field) && (index >= 0) && \
@@ -134 +133 @@
         } \
         \
-        type **name##_get_field(name##_ref field) \
+        type **name##_get_field(name##_t *field) \
         { \
                 return name##_is_valid(field) ? field->items : NULL; \
         } \
         \
-        int name##_initialize(name##_ref field) \
+        int name##_initialize(name##_t *field) \
         { \
                 if (!field) \
@@ -153 +152 @@
         } \
         \
-        int name##_is_valid(name##_ref field) \
+        int name##_is_valid(name##_t *field) \
         { \
                 return field && (field->magic == GENERIC_FIELD_MAGIC_VALUE); \

uspace/lib/c/include/adt/int_map.h

@@ -56 +56 @@
 #define INT_MAP_DECLARE(name, type) \
         typedef struct name name##_t; \
-        typedef name##_t *name##_ref; \
         typedef struct name##_item name##_item_t; \
-        typedef name##_item_t *name##_item_ref; \
         \
         struct  name##_item { \
@@ -69 +67 @@
                 int size; \
                 int next; \
-                name##_item_ref items; \
+                name##_item_t *items; \
                 int magic; \
         }; \
         \
-        int name##_add(name##_ref, int, type *); \
-        void name##_clear(name##_ref); \
-        int name##_count(name##_ref); \
-        void name##_destroy(name##_ref); \
-        void name##_exclude(name##_ref, int); \
-        void name##_exclude_index(name##_ref, int); \
-        type *name##_find(name##_ref, int); \
-        int name##_update(name##_ref, int, int); \
-        type *name##_get_index(name##_ref, int); \
-        int name##_initialize(name##_ref); \
-        int name##_is_valid(name##_ref); \
-        void name##_item_destroy(name##_item_ref); \
-        int name##_item_is_valid(name##_item_ref);
+        int name##_add(name##_t *, int, type *); \
+        void name##_clear(name##_t *); \
+        int name##_count(name##_t *); \
+        void name##_destroy(name##_t *); \
+        void name##_exclude(name##_t *, int); \
+        void name##_exclude_index(name##_t *, int); \
+        type *name##_find(name##_t *, int); \
+        int name##_update(name##_t *, int, int); \
+        type *name##_get_index(name##_t *, int); \
+        int name##_initialize(name##_t *); \
+        int name##_is_valid(name##_t *); \
+        void name##_item_destroy(name##_item_t *); \
+        int name##_item_is_valid(name##_item_t *);
 
 /** Integer to generic type map implementation.
@@ -95 +93 @@
  */
 #define INT_MAP_IMPLEMENT(name, type) \
-        int name##_add(name##_ref map, int key, type *value) \
+        int name##_add(name##_t *map, int key, type *value) \
         { \
                 if (name##_is_valid(map)) { \
                         if (map->next == (map->size - 1)) { \
-                                name##_item_ref tmp; \
-                                tmp = (name##_item_ref) realloc(map->items, \
+                                name##_item_t *tmp; \
+                                tmp = (name##_item_t *) realloc(map->items, \
                                     sizeof(name##_item_t) * 2 * map->size); \
                                 if (!tmp) \
@@ -117 +115 @@
         } \
         \
-        void name##_clear(name##_ref map) \
+        void name##_clear(name##_t *map) \
         { \
                 if (name##_is_valid(map)) { \
@@ -132 +130 @@
         } \
         \
-        int name##_count(name##_ref map) \
+        int name##_count(name##_t *map) \
         { \
                 return name##_is_valid(map) ? map->next : -1; \
         } \
         \
-        void name##_destroy(name##_ref map) \
+        void name##_destroy(name##_t *map) \
         { \
                 if (name##_is_valid(map)) { \
@@ -152 +150 @@
         } \
         \
-        void name##_exclude(name##_ref map, int key) \
+        void name##_exclude(name##_t *map, int key) \
         { \
                 if (name##_is_valid(map)) { \
@@ -166 +164 @@
         } \
         \
-        void name##_exclude_index(name##_ref map, int index) \
+        void name##_exclude_index(name##_t *map, int index) \
         { \
                 if (name##_is_valid(map) && (index >= 0) && \
@@ -175 +173 @@
         } \
         \
-        type *name##_find(name##_ref map, int key) \
+        type *name##_find(name##_t *map, int key) \
         { \
                 if (name##_is_valid(map)) { \
@@ -189 +187 @@
         } \
         \
-        int name##_update(name##_ref map, int key, int new_key) \
+        int name##_update(name##_t *map, int key, int new_key) \
         { \
                 if (name##_is_valid(map)) { \
@@ -208 +206 @@
         } \
         \
-        type *name##_get_index(name##_ref map, int index) \
+        type *name##_get_index(name##_t *map, int index) \
         { \
                 if (name##_is_valid(map) && (index >= 0) && \
@@ -218 +216 @@
         } \
         \
-        int name##_initialize(name##_ref map) \
+        int name##_initialize(name##_t *map) \
         { \
                 if (!map) \
@@ -224 +222 @@
                 map->size = 2; \
                 map->next = 0; \
-                map->items = (name##_item_ref) malloc(sizeof(name##_item_t) * \
+                map->items = (name##_item_t *) malloc(sizeof(name##_item_t) * \
                     map->size); \
                 if (!map->items) \
@@ -233 +231 @@
         } \
         \
-        int name##_is_valid(name##_ref map) \
+        int name##_is_valid(name##_t *map) \
         { \
                 return map && (map->magic == INT_MAP_MAGIC_VALUE); \
         } \
         \
-        void name##_item_destroy(name##_item_ref item) \
+        void name##_item_destroy(name##_item_t *item) \
         { \
                 if (name##_item_is_valid(item)) { \
@@ -249 +247 @@
         } \
         \
-        int name##_item_is_valid(name##_item_ref item) \
+        int name##_item_is_valid(name##_item_t *item) \
         { \
                 return item && (item->magic == INT_MAP_ITEM_MAGIC_VALUE); \

uspace/lib/c/include/adt/measured_strings.h

@@ -47 +47 @@
 typedef struct measured_string measured_string_t;
 
-/** Type definition of the character string with measured length pointer.
- * @see measured_string
- */
-typedef measured_string_t *measured_string_ref;
-
 /** Character string with measured length.
  *
@@ -64 +59 @@
 };
 
-extern measured_string_ref measured_string_create_bulk(const char *, size_t);
-extern measured_string_ref measured_string_copy(measured_string_ref);
-extern int measured_strings_receive(measured_string_ref *, char **, size_t);
-extern int measured_strings_reply(const measured_string_ref, size_t);
-extern int measured_strings_return(int, measured_string_ref *, char **, size_t);
-extern int measured_strings_send(int, const measured_string_ref, size_t);
+extern measured_string_t *measured_string_create_bulk(const char *, size_t);
+extern measured_string_t *measured_string_copy(measured_string_t *);
+extern int measured_strings_receive(measured_string_t **, char **, size_t);
+extern int measured_strings_reply(const measured_string_t *, size_t);
+extern int measured_strings_return(int, measured_string_t **, char **, size_t);
+extern int measured_strings_send(int, const measured_string_t *, size_t);
 
 #endif

uspace/lib/c/include/net/device.h

@@ -59 +59 @@
  */
 typedef struct device_stats device_stats_t;
-
-/** Type definition of the device usage statistics pointer.
- * @see device_stats
- */
-typedef device_stats_t *device_stats_ref;
 
 /** Device state. */

uspace/lib/c/include/net/packet.h

@@ -48 +48 @@
 typedef struct packet * packet_t;
 
-/** Type definition of the packet pointer.
- * @see packet
- */
-typedef packet_t * packet_ref;
-
 /** Type definition of the packet dimension.
  * @see packet_dimension
  */
 typedef struct packet_dimension packet_dimension_t;
-
-/** Type definition of the packet dimension pointer.
- * @see packet_dimension
- */
-typedef packet_dimension_t * packet_dimension_ref;
 
 /** Packet dimension. */

uspace/lib/net/adt/module_map.c

@@ -63 +63 @@
  */
 int
-add_module(module_ref *module, modules_ref modules, const char *name,
+add_module(module_t **module, modules_t *modules, const char *name,
     const char *filename, services_t service, task_id_t task_id,
     connect_module_t connect_module)
 {
-        module_ref tmp_module;
+        module_t *tmp_module;
         int rc;
 
-        tmp_module = (module_ref) malloc(sizeof(module_t));
+        tmp_module = (module_t *) malloc(sizeof(module_t));
         if (!tmp_module)
                 return ENOMEM;
@@ -104 +104 @@
  * @returns             NULL if there is no such module.
  */
-module_ref get_running_module(modules_ref modules, char *name)
+module_t *get_running_module(modules_t *modules, char *name)
 {
-        module_ref module;
+        module_t *module;
 
         module = modules_find(modules, name, 0);

uspace/lib/net/generic/generic.c

@@ -100 +100 @@
 int
 generic_get_addr_req(int phone, int message, device_id_t device_id,
-    measured_string_ref *address, char ** data)
+    measured_string_t **address, char ** data)
 {
         aid_t message_id;
@@ -138 +138 @@
 int
 generic_packet_size_req_remote(int phone, int message, device_id_t device_id,
-    packet_dimension_ref packet_dimension)
+    packet_dimension_t *packet_dimension)
 {
         if (!packet_dimension)
@@ -233 +233 @@
 int
 generic_translate_req(int phone, int message, device_id_t device_id,
-    services_t service, measured_string_ref configuration, size_t count,
-    measured_string_ref *translation, char **data)
+    services_t service, measured_string_t *configuration, size_t count,
+    measured_string_t **translation, char **data)
 {
         aid_t message_id;

uspace/lib/net/generic/net_remote.c

@@ -63 +63 @@
  * @see net_get_conf_req()
  */
-void net_free_settings(measured_string_ref settings, char *data)
+void net_free_settings(measured_string_t *settings, char *data)
 {
         if (settings)
@@ -90 +90 @@
  */
 int
-net_get_conf_req(int net_phone, measured_string_ref *configuration,
+net_get_conf_req(int net_phone, measured_string_t **configuration,
     size_t count, char **data)
 {
@@ -118 +118 @@
 int
 net_get_device_conf_req(int net_phone, device_id_t device_id,
-    measured_string_ref *configuration, size_t count, char **data)
+    measured_string_t **configuration, size_t count, char **data)
 {
         return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF,

uspace/lib/net/generic/packet_remote.c

@@ -64 +64 @@
  */
 static int
-packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size)
+packet_return(int phone, packet_t *packet, packet_id_t packet_id, size_t size)
 {
         ipc_call_t answer;
@@ -107 +107 @@
  *                      function.
  */
-int packet_translate_remote(int phone, packet_ref packet, packet_id_t packet_id)
+int packet_translate_remote(int phone, packet_t *packet, packet_id_t packet_id)
 {
         int rc;

uspace/lib/net/il/arp_remote.c

@@ -83 +83 @@
 int
 arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol,
-    measured_string_ref address)
+    measured_string_t *address)
 {
         aid_t message_id;
@@ -133 +133 @@
  */
 int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol,
-    services_t netif, measured_string_ref address)
+    services_t netif, measured_string_t *address)
 {
         aid_t message_id;
@@ -165 +165 @@
 int
 arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol,
-    measured_string_ref address, measured_string_ref *translation, char **data)
+    measured_string_t *address, measured_string_t **translation, char **data)
 {
         return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id,

uspace/lib/net/il/ip_client.c

@@ -53 +53 @@
 size_t ip_client_header_length(packet_t packet)
 {
-        ip_header_ref header;
-
-        header = (ip_header_ref) packet_get_data(packet);
+        ip_header_t *header;
+
+        header = (ip_header_t *) packet_get_data(packet);
         if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t)))
                 return 0;
@@ -91 +91 @@
     size_t data_length, void **header, size_t *headerlen)
 {
-        ipv4_pseudo_header_ref header_in;
+        ipv4_pseudo_header_t *header_in;
         struct sockaddr_in *address_in;
 
@@ -109 +109 @@
                 
                 *headerlen = sizeof(*header_in);
-                header_in = (ipv4_pseudo_header_ref) malloc(*headerlen);
+                header_in = (ipv4_pseudo_header_t *) malloc(*headerlen);
                 if (!header_in)
                         return ENOMEM;
@@ -155 +155 @@
     ip_tos_t tos, int dont_fragment, size_t ipopt_length)
 {
-        ip_header_ref header;
+        ip_header_t *header;
         uint8_t *data;
         size_t padding;
@@ -177 +177 @@
 
         // set the header
-        header = (ip_header_ref) data;
+        header = (ip_header_t *) data;
         header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) +
             ipopt_length);
@@ -211 +211 @@
     ip_ttl_t *ttl, ip_tos_t *tos, int *dont_fragment, size_t *ipopt_length)
 {
-        ip_header_ref header;
-
-        header = (ip_header_ref) packet_get_data(packet);
+        ip_header_t *header;
+
+        header = (ip_header_t *) packet_get_data(packet);
         if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t)))
                 return ENOMEM;
@@ -247 +247 @@
     size_t data_length)
 {
-        ipv4_pseudo_header_ref header_in;
+        ipv4_pseudo_header_t *header_in;
 
         if (!header)
@@ -253 +253 @@
 
         if (headerlen == sizeof(ipv4_pseudo_header_t)) {
-                header_in = (ipv4_pseudo_header_ref) header;
+                header_in = (ipv4_pseudo_header_t *) header;
                 header_in->data_length = htons(data_length);
                 return EOK;

uspace/lib/net/il/ip_remote.c

@@ -186 +186 @@
  */
 int ip_packet_size_req_remote(int ip_phone, device_id_t device_id,
-    packet_dimension_ref packet_dimension)
+    packet_dimension_t *packet_dimension)
 {
         return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE,

uspace/lib/net/include/adt/module_map.h

@@ -48 +48 @@
 typedef struct module_struct module_t;
 
-/** Type definition of the module structure pointer.
- * @see module_struct
- */
-typedef module_t *module_ref;
-
 /** Module map.
  * Sorted by module names.
@@ -77 +72 @@
 };
 
-extern int add_module(module_ref *, modules_ref, const char *, const char *,
+extern int add_module(module_t **, modules_t *, const char *, const char *,
     services_t, task_id_t, connect_module_t *);
-extern module_ref get_running_module(modules_ref, char *);
+extern module_t *get_running_module(modules_t *, char *);
 extern task_id_t spawn(const char *);
 

uspace/lib/net/include/arp_interface.h

@@ -48 +48 @@
 
 extern int arp_device_req(int, device_id_t, services_t, services_t,
-    measured_string_ref);
-extern int arp_translate_req(int, device_id_t, services_t, measured_string_ref,
-    measured_string_ref *, char **);
+    measured_string_t *);
+extern int arp_translate_req(int, device_id_t, services_t, measured_string_t *,
+    measured_string_t **, char **);
 extern int arp_clear_device_req(int, device_id_t);
 extern int arp_clear_address_req(int, device_id_t, services_t,
-    measured_string_ref);
+    measured_string_t *);
 extern int arp_clean_cache_req(int);
 extern int arp_connect_module(services_t);

uspace/lib/net/include/generic.h

@@ -49 +49 @@
     services_t);
 extern int generic_device_req_remote(int, int, device_id_t, int, services_t);
-extern int generic_get_addr_req(int, int, device_id_t, measured_string_ref *,
+extern int generic_get_addr_req(int, int, device_id_t, measured_string_t **,
     char **);
 extern int generic_packet_size_req_remote(int, int, device_id_t,
-    packet_dimension_ref);
+    packet_dimension_t *);
 extern int generic_received_msg_remote(int, int, device_id_t, packet_id_t,
     services_t, services_t);
@@ -58 +58 @@
     services_t, services_t);
 extern int generic_translate_req(int, int, device_id_t, services_t,
-    measured_string_ref, size_t, measured_string_ref *, char **);
+    measured_string_t *, size_t, measured_string_t **, char **);
 
 #endif

uspace/lib/net/include/icmp_header.h

@@ -52 +52 @@
 typedef struct icmp_echo icmp_echo_t;
 
-/** Type definition of the echo specific data pointer.
- * @see icmp_echo
- */
-typedef icmp_echo_t *icmp_echo_ref;
-
 /** Echo specific data. */
 struct icmp_echo {
@@ -69 +64 @@
  */
 typedef struct icmp_header icmp_header_t;
-
-/** Type definition of the internet control message header pointer.
- * @see icmp_header
- */
-typedef icmp_header_t *icmp_header_ref;
 
 /** Internet control message header. */

uspace/lib/net/include/ip_header.h

@@ -127 +127 @@
 typedef struct ip_header ip_header_t;
 
-/** Type definition of the internet header pointer.
- * @see ip_header
- */
-typedef ip_header_t *ip_header_ref;
-
 /** Type definition of the internet option header.
  * @see ip_header
@@ -137 +132 @@
 typedef struct ip_option ip_option_t;
 
-/** Type definition of the internet option header pointer.
- * @see ip_header
- */
-typedef ip_option_t *ip_option_ref;
-
 /** Type definition of the internet version 4 pseudo header.
  * @see ipv4_pseudo_header
  */
 typedef struct ipv4_pseudo_header ipv4_pseudo_header_t;
-
-/** Type definition of the internet version 4 pseudo header pointer.
- * @see ipv4_pseudo_header
- */
-typedef ipv4_pseudo_header_t *ipv4_pseudo_header_ref;
 
 /** Internet header.

uspace/lib/net/include/ip_remote.h

@@ -44 +44 @@
 
 extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t);
-extern int ip_packet_size_req_remote(int, device_id_t, packet_dimension_ref);
+extern int ip_packet_size_req_remote(int, device_id_t, packet_dimension_t *);
 extern int ip_received_error_msg_remote(int, device_id_t, packet_t, services_t,
     services_t);

uspace/lib/net/include/net_interface.h

@@ -44 +44 @@
 /*@{*/
 
-extern int net_get_device_conf_req(int, device_id_t, measured_string_ref *,
+extern int net_get_device_conf_req(int, device_id_t, measured_string_t **,
     size_t, char **);
-extern int net_get_conf_req(int, measured_string_ref *, size_t, char **);
-extern void net_free_settings(measured_string_ref, char *);
+extern int net_get_conf_req(int, measured_string_t **, size_t, char **);
+extern void net_free_settings(measured_string_t *, char *);
 extern int net_connect_module(void);
 

uspace/lib/net/include/netif_local.h

@@ -158 +158 @@
  */
 extern int netif_get_addr_message(device_id_t device_id,
-    measured_string_ref address);
+    measured_string_t *address);
 
 /** Process the netif driver specific message.
@@ -193 +193 @@
  */
 extern int netif_get_device_stats(device_id_t device_id,
-    device_stats_ref stats);
-
-extern int netif_get_addr_req_local(int, device_id_t, measured_string_ref *,
+    device_stats_t *stats);
+
+extern int netif_get_addr_req_local(int, device_id_t, measured_string_t **,
     char **);
 extern int netif_probe_req_local(int, device_id_t, int, int);
@@ -201 +201 @@
 extern int netif_start_req_local(int, device_id_t);
 extern int netif_stop_req_local(int, device_id_t);
-extern int netif_stats_req_local(int, device_id_t, device_stats_ref);
+extern int netif_stats_req_local(int, device_id_t, device_stats_t *);
 extern int netif_bind_service_local(services_t, device_id_t, services_t,
     async_client_conn_t);
 
 extern int find_device(device_id_t, netif_device_t **);
-extern void null_device_stats(device_stats_ref);
+extern void null_device_stats(device_stats_t *);
 extern void netif_pq_release(packet_id_t);
 extern packet_t netif_packet_get_1(size_t);

uspace/lib/net/include/netif_remote.h

@@ -41 +41 @@
 #include <net/packet.h>
 
-extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ref *,
+extern int netif_get_addr_req_remote(int, device_id_t, measured_string_t **,
     char **);
 extern int netif_probe_req_remote(int, device_id_t, int, int);
@@ -47 +47 @@
 extern int netif_start_req_remote(int, device_id_t);
 extern int netif_stop_req_remote(int, device_id_t);
-extern int netif_stats_req_remote(int, device_id_t, device_stats_ref);
+extern int netif_stats_req_remote(int, device_id_t, device_stats_t *);
 extern int netif_bind_service_remote(services_t, device_id_t, services_t,
     async_client_conn_t);

uspace/lib/net/include/packet_remote.h

@@ -37 +37 @@
 #include <sys/types.h>
 
-extern int packet_translate_remote(int, packet_ref, packet_id_t);
+extern int packet_translate_remote(int, packet_t *, packet_id_t);
 extern packet_t packet_get_4_remote(int, size_t, size_t, size_t, size_t);
 extern packet_t packet_get_1_remote(int, size_t);

uspace/lib/net/include/socket_core.h

@@ -66 +66 @@
 typedef struct socket_core socket_core_t;
 
-/** Type definition of the socket core pointer.
- * @see socket_core
- */
-typedef socket_core_t *socket_core_ref;
-
 /** Type definition of the socket port.
  * @see socket_port
  */
 typedef struct socket_port socket_port_t;
-
-/** Type definition of the socket port pointer.
- * @see socket_port
- */
-typedef socket_port_t *socket_port_ref;
 
 /** Socket core. */
@@ -111 +101 @@
  * the other use the remote addresses.
  */
-GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_ref);
+GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_t *);
 
 /** Ports map.
@@ -118 +108 @@
 INT_MAP_DECLARE(socket_ports, socket_port_t);
 
-extern void socket_cores_release(int, socket_cores_ref, socket_ports_ref,
-    void (*)(socket_core_ref));
-extern int socket_bind(socket_cores_ref, socket_ports_ref, int, void *, size_t,
+extern void socket_cores_release(int, socket_cores_t *, socket_ports_t *,
+    void (*)(socket_core_t *));
+extern int socket_bind(socket_cores_t *, socket_ports_t *, int, void *, size_t,
     int, int, int);
-extern int socket_bind_free_port(socket_ports_ref, socket_core_ref, int, int,
+extern int socket_bind_free_port(socket_ports_t *, socket_core_t *, int, int,
     int);
-extern int socket_create(socket_cores_ref, int, void *, int *);
-extern int socket_destroy(int, int, socket_cores_ref, socket_ports_ref,
-    void (*)(socket_core_ref));
+extern int socket_create(socket_cores_t *, int, void *, int *);
+extern int socket_destroy(int, int, socket_cores_t *, socket_ports_t *,
+    void (*)(socket_core_t *));
 extern int socket_reply_packets(packet_t, size_t *);
-extern socket_core_ref socket_port_find(socket_ports_ref, int, const char *,
+extern socket_core_t *socket_port_find(socket_ports_t *, int, const char *,
     size_t);
-extern void socket_port_release(socket_ports_ref, socket_core_ref);
-extern int socket_port_add(socket_ports_ref, int, socket_core_ref,
+extern void socket_port_release(socket_ports_t *, socket_core_t *);
+extern int socket_port_add(socket_ports_t *, int, socket_core_t *,
     const char *, size_t);
 

uspace/lib/net/include/tl_common.h

@@ -51 +51 @@
 DEVICE_MAP_DECLARE(packet_dimensions, packet_dimension_t);
 
-extern int tl_get_ip_packet_dimension(int, packet_dimensions_ref,
-    device_id_t, packet_dimension_ref *);
+extern int tl_get_ip_packet_dimension(int, packet_dimensions_t *,
+    device_id_t, packet_dimension_t **);
 extern int tl_get_address_port(const struct sockaddr *, int, uint16_t *);
-extern int tl_update_ip_packet_dimension(packet_dimensions_ref, device_id_t,
+extern int tl_update_ip_packet_dimension(packet_dimensions_t *, device_id_t,
     size_t);
 extern int tl_set_address_port(struct sockaddr *, int, uint16_t);
 extern int tl_prepare_icmp_packet(int, int, packet_t, services_t);
-extern int tl_socket_read_packet_data(int, packet_ref, size_t,
-    const packet_dimension_ref, const struct sockaddr *, socklen_t);
+extern int tl_socket_read_packet_data(int, packet_t *, size_t,
+    const packet_dimension_t *, const struct sockaddr *, socklen_t);
 
 #endif

uspace/lib/net/netif/netif_local.c

@@ -181 +181 @@
  */
 int netif_stats_req_local(int netif_phone, device_id_t device_id,
-    device_stats_ref stats)
+    device_stats_t *stats)
 {
         fibril_rwlock_read_lock(&netif_globals.lock);
@@ -203 +203 @@
  */
 int netif_get_addr_req_local(int netif_phone, device_id_t device_id,
-    measured_string_ref *address, char **data)
+    measured_string_t **address, char **data)
 {
         int rc;
@@ -253 +253 @@
  * @param[in] stats     The usage statistics.
  */
-void null_device_stats(device_stats_ref stats)
+void null_device_stats(device_stats_t *stats)
 {
         bzero(stats, sizeof(device_stats_t));

uspace/lib/net/netif/netif_remote.c

@@ -60 +60 @@
  */
 int netif_get_addr_req_remote(int netif_phone, device_id_t device_id,
-    measured_string_ref *address, char **data)
+    measured_string_t **address, char **data)
 {
         return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id,
@@ -138 +138 @@
  */
 int netif_stats_req_remote(int netif_phone, device_id_t device_id,
-    device_stats_ref stats)
+    device_stats_t *stats)
 {
         if (!stats)

uspace/lib/net/tl/icmp_client.c

@@ -64 +64 @@
     icmp_code_t *code, icmp_param_t *pointer, icmp_param_t *mtu)
 {
-        icmp_header_ref header;
+        icmp_header_t *header;
 
-        header = (icmp_header_ref) packet_get_data(packet);
+        header = (icmp_header_t *) packet_get_data(packet);
         if (!header ||
             (packet_get_data_length(packet) < sizeof(icmp_header_t))) {

uspace/lib/net/tl/socket_core.c

@@ -68 +68 @@
 INT_MAP_IMPLEMENT(socket_cores, socket_core_t);
 
-GENERIC_CHAR_MAP_IMPLEMENT(socket_port_map, socket_core_ref);
+GENERIC_CHAR_MAP_IMPLEMENT(socket_port_map, socket_core_t *);
 
 INT_MAP_IMPLEMENT(socket_ports, socket_port_t);
@@ -85 +85 @@
  */
 static void
-socket_destroy_core(int packet_phone, socket_core_ref socket,
-    socket_cores_ref local_sockets, socket_ports_ref global_sockets,
-    void (* socket_release)(socket_core_ref socket))
+socket_destroy_core(int packet_phone, socket_core_t *socket,
+    socket_cores_t *local_sockets, socket_ports_t *global_sockets,
+    void (* socket_release)(socket_core_t *socket))
 {
         int packet_id;
@@ -121 +121 @@
  */
 void
-socket_cores_release(int packet_phone, socket_cores_ref local_sockets,
-    socket_ports_ref global_sockets,
-    void (* socket_release)(socket_core_ref socket))
+socket_cores_release(int packet_phone, socket_cores_t *local_sockets,
+    socket_ports_t *global_sockets,
+    void (* socket_release)(socket_core_t *socket))
 {
         int index;
@@ -160 +160 @@
  */
 static int
-socket_port_add_core(socket_port_ref socket_port, socket_core_ref socket,
+socket_port_add_core(socket_port_t *socket_port, socket_core_t *socket,
     const char *key, size_t key_length)
 {
-        socket_core_ref *socket_ref;
+        socket_core_t **socket_ref;
         int rc;
 
@@ -200 +200 @@
  */
 static int
-socket_bind_insert(socket_ports_ref global_sockets, socket_core_ref socket,
+socket_bind_insert(socket_ports_t *global_sockets, socket_core_t *socket,
     int port)
 {
-        socket_port_ref socket_port;
+        socket_port_t *socket_port;
         int rc;
 
@@ -258 +258 @@
  */
 int
-socket_bind(socket_cores_ref local_sockets, socket_ports_ref global_sockets,
+socket_bind(socket_cores_t *local_sockets, socket_ports_t *global_sockets,
     int socket_id, void *addr, size_t addrlen, int free_ports_start,
     int free_ports_end, int last_used_port)
 {
-        socket_core_ref socket;
-        socket_port_ref socket_port;
+        socket_core_t *socket;
+        socket_port_t *socket_port;
         struct sockaddr *address;
         struct sockaddr_in *address_in;
@@ -328 +328 @@
  */
 int
-socket_bind_free_port(socket_ports_ref global_sockets, socket_core_ref socket,
+socket_bind_free_port(socket_ports_t *global_sockets, socket_core_t *socket,
     int free_ports_start, int free_ports_end, int last_used_port)
 {
@@ -370 +370 @@
  * @returns             ELIMIT if there is no socket identifier available.
  */
-static int socket_generate_new_id(socket_cores_ref local_sockets, int positive)
+static int socket_generate_new_id(socket_cores_t *local_sockets, int positive)
 {
         int socket_id;
@@ -415 +415 @@
  */
 int
-socket_create(socket_cores_ref local_sockets, int app_phone,
+socket_create(socket_cores_t *local_sockets, int app_phone,
     void *specific_data, int *socket_id)
 {
-        socket_core_ref socket;
+        socket_core_t *socket;
         int positive;
         int rc;
@@ -437 +437 @@
         }
         
-        socket = (socket_core_ref) malloc(sizeof(*socket));
+        socket = (socket_core_t *) malloc(sizeof(*socket));
         if (!socket)
                 return ENOMEM;
@@ -486 +486 @@
  */
 int
-socket_destroy(int packet_phone, int socket_id, socket_cores_ref local_sockets,
-    socket_ports_ref global_sockets,
-    void (*socket_release)(socket_core_ref socket))
-{
-        socket_core_ref socket;
+socket_destroy(int packet_phone, int socket_id, socket_cores_t *local_sockets,
+    socket_ports_t *global_sockets,
+    void (*socket_release)(socket_core_t *socket))
+{
+        socket_core_t *socket;
         int accepted_id;
 
@@ -601 +601 @@
  * @returns             NULL if no socket was found.
  */
-socket_core_ref
-socket_port_find(socket_ports_ref global_sockets, int port, const char *key,
+socket_core_t *
+socket_port_find(socket_ports_t *global_sockets, int port, const char *key,
     size_t key_length)
 {
-        socket_port_ref socket_port;
-        socket_core_ref *socket_ref;
+        socket_port_t *socket_port;
+        socket_core_t **socket_ref;
 
         socket_port = socket_ports_find(global_sockets, port);
@@ -628 +628 @@
  */
 void
-socket_port_release(socket_ports_ref global_sockets, socket_core_ref socket)
-{
-        socket_port_ref socket_port;
-        socket_core_ref *socket_ref;
+socket_port_release(socket_ports_t *global_sockets, socket_core_t *socket)
+{
+        socket_port_t *socket_port;
+        socket_core_t **socket_ref;
 
         if (!socket->port)
@@ -679 +679 @@
  */
 int
-socket_port_add(socket_ports_ref global_sockets, int port,
-    socket_core_ref socket, const char *key, size_t key_length)
-{
-        socket_port_ref socket_port;
+socket_port_add(socket_ports_t *global_sockets, int port,
+    socket_core_t *socket, const char *key, size_t key_length)
+{
+        socket_port_t *socket_port;
         int rc;
 

uspace/lib/net/tl/tl_common.c

@@ -120 +120 @@
 int
 tl_get_ip_packet_dimension(int ip_phone,
-    packet_dimensions_ref packet_dimensions, device_id_t device_id,
-    packet_dimension_ref *packet_dimension)
+    packet_dimensions_t *packet_dimensions, device_id_t device_id,
+    packet_dimension_t **packet_dimension)
 {
         int rc;
@@ -162 +162 @@
  */
 int
-tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions,
+tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
     device_id_t device_id, size_t content)
 {
-        packet_dimension_ref packet_dimension;
+        packet_dimension_t *packet_dimension;
 
         packet_dimension = packet_dimensions_find(packet_dimensions, device_id);
@@ -287 +287 @@
  */
 int
-tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix,
-    const packet_dimension_ref dimension, const struct sockaddr *addr,
+tl_socket_read_packet_data(int packet_phone, packet_t *packet, size_t prefix,
+    const packet_dimension_t *dimension, const struct sockaddr *addr,
     socklen_t addrlen)
 {

uspace/lib/packet/generic/packet_server.c

@@ -103 +103 @@
 };
 
-int packet_translate_local(int phone, packet_ref packet, packet_id_t packet_id)
+int packet_translate_local(int phone, packet_t *packet, packet_id_t packet_id)
 {
         if (!packet)

uspace/lib/packet/include/packet_local.h

@@ -43 +43 @@
 /*@{*/
 
-extern int packet_translate_local(int, packet_ref, packet_id_t);
+extern int packet_translate_local(int, packet_t *, packet_id_t);
 extern packet_t packet_get_4_local(int, size_t, size_t, size_t, size_t);
 extern packet_t packet_get_1_local(int, size_t);