Changeset 257feec in mainline for uspace/lib

Timestamp:

2013-06-27T12:48:32Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9f391e9

Parents:

679ee84

Message:

cstyle (no change in functionality)

Location:

uspace/lib/c/include/net

Files:

• in.h (modified) (1 diff)
• in6.h (modified) (2 diffs)
• inet.h (modified) (1 diff)
• socket_codes.h (modified) (2 diffs)

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

@@ -45 +45 @@
 #define INET_ADDRSTRLEN  (4 * 3 + 3 + 1)
 
-#define INADDR_ANY 0
+#define INADDR_ANY  0
 
 /** INET address. */

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

@@ -43 +43 @@
 
 /** INET6 string address maximum length. */
-#define INET6_ADDRSTRLEN        (8 * 4 + 7 + 1)
-
-/** Type definition of the INET6 address.
- * @see in6_addr
- */
-typedef struct in6_addr in6_addr_t;
-
-/** Type definition of the INET6 socket address.
- * @see sockaddr_in6
- */
-typedef struct sockaddr_in6     sockaddr_in6_t;
+#define INET6_ADDRSTRLEN  (8 * 4 + 7 + 1)
 
 /** INET6 address. */
-struct in6_addr {
+typedef struct in6_addr {
         /** 16 byte IPv6 address. */
-        unsigned char s6_addr[16];
-};
+        uint8_t s6_addr[16];
+} in6_addr_t;
 
 /** INET6 socket address.
  * @see sockaddr
  */
-struct sockaddr_in6 {
+typedef struct sockaddr_in6 {
         /** Address family. Should be AF_INET6. */
         uint16_t sin6_family;
@@ -75 +65 @@
         /** Scope identifier. */
         uint32_t sin6_scope_id;
-};
+} sockaddr_in6_t;
 
 #endif

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

@@ -41 +41 @@
 #include <byteorder.h>
 
-/** Type definition of the socket address.
- * @see sockaddr
- */
-typedef struct sockaddr         sockaddr_t;
-
 /** Type definition of the address information.
  * @see addrinfo
  */
-typedef struct addrinfo         addrinfo_t;
+typedef struct addrinfo addrinfo_t;
 
 /** Socket address. */
-struct sockaddr {
+typedef struct sockaddr {
         /** Address family. @see socket.h */
         uint16_t sa_family;
         /** 14 byte protocol address. */
         uint8_t sa_data[14];
-};
+} sockaddr_t;
 
 extern int inet_ntop(uint16_t, const uint8_t *, char *, size_t);

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

@@ -46 +46 @@
 enum {
         AF_NONE = 0,
-        AF_INET,        /* IPv4 address */
-        AF_INET6        /* IPv6 address */
+        AF_INET,  /* IPv4 address */
+        AF_INET6  /* IPv6 address */
 };
 
@@ -53 +53 @@
 
 /** @name Protocol families definitions
- *  Same as address families.
+ * Same as address families.
  */
 /*@{*/
 
-#define PF_INET         AF_INET
-#define PF_INET6        AF_INET6
+#define PF_INET   AF_INET
+#define PF_INET6  AF_INET6
 
 /*@}*/