Changeset 858fc90 in mainline for uspace/srv/net/include/inet.h

Timestamp:

2010-03-15T19:35:25Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6092b56e

Parents:

92307f1 (diff), 4684368 (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 from bzr://bzr.helenos.org/head.

File:

• uspace/srv/net/include/inet.h (modified) (3 diffs)

uspace/srv/net/include/inet.h

@@ -62 +62 @@
  *  @returns ENOTSUP if the address family is not supported.
  */
-int     inet_ntop( uint16_t family, const uint8_t * data, char * address, size_t length );
+int inet_ntop(uint16_t family, const uint8_t * data, char * address, size_t length);
 
 /** Parses the character string into the address.
@@ -74 +74 @@
  *  @returns ENOTSUP if the address family is not supported.
  */
-int     inet_pton( uint16_t family, const char * address, uint8_t * data );
+int inet_pton(uint16_t family, const char * address, uint8_t * data);
 
 /** Socket address.
@@ -82 +82 @@
          *  @see socket.h
          */
-        uint16_t                sa_family;
+        uint16_t sa_family;
         /** 14 byte protocol address.
          */
-        uint8_t                 sa_data[ 14 ];
+        uint8_t sa_data[14];
 };