Changeset f05edcb in mainline for uspace/lib/inet/src/addr.c

Timestamp:

2021-08-08T08:28:24Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d5ed54b

Parents:

98a935e

Message:

Make addr48_t a structure

File:

• uspace/lib/inet/src/addr.c (modified) (4 diffs)

uspace/lib/inet/src/addr.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2013 Martin Decky
  * All rights reserved.
@@ -72 +72 @@
 };
 
-void addr48(const addr48_t src, addr48_t dst)
-{
-        memcpy(dst, src, 6);
+void addr48(const addr48_t *src, addr48_t *dst)
+{
+        memcpy(dst, src, sizeof(addr48_t));
 }
 
@@ -86 +86 @@
  * @return Non-zero if equal, zero if not equal.
  */
-int addr48_compare(const addr48_t a, const addr48_t b)
-{
-        return memcmp(a, b, 6) == 0;
+int addr48_compare(const addr48_t *a, const addr48_t *b)
+{
+        return memcmp(a->b, b->b, 6) == 0;
 }
 
@@ -106 +106 @@
  *
  */
-void addr48_solicited_node(const addr128_t ip, addr48_t mac)
-{
-        memcpy(mac, inet_addr48_solicited_node, 3);
-        memcpy(mac + 3, ip + 13, 3);
+void addr48_solicited_node(const addr128_t ip, addr48_t *mac)
+{
+        memcpy(&mac->b[0], &inet_addr48_solicited_node.b[0], 3);
+        memcpy(&mac->b[3], ip + 13, 3);
 }