Changeset 8f8a0cd6 in mainline for uspace/lib/c/generic/net/inet.c

Timestamp:

2011-01-07T09:13:55Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0f191a2, 692c0d3e

Parents:

71ed4849 (diff), ae1f70e (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 development/ changes

File:

• uspace/lib/c/generic/net/inet.c (modified) (6 diffs)

uspace/lib/c/generic/net/inet.c

@@ -64 +64 @@
         switch (family) {
         case AF_INET:
-                // check the output buffer size
+                /* Check output buffer size */
                 if (length < INET_ADDRSTRLEN)
                         return ENOMEM;
                         
-                // fill the buffer with the IPv4 address
+                /* Fill buffer with IPv4 address */
                 snprintf(address, length, "%hhu.%hhu.%hhu.%hhu",
                     data[0], data[1], data[2], data[3]);
@@ -75 +75 @@
 
         case AF_INET6:
-                // check the output buffer size
+                /* Check output buffer size */
                 if (length < INET6_ADDRSTRLEN)
                         return ENOMEM;
                 
-                // fill the buffer with the IPv6 address
+                /* Fill buffer with IPv6 address */
                 snprintf(address, length,
                     "%hhx%hhx:%hhx%hhx:%hhx%hhx:%hhx%hhx:%hhx%hhx:%hhx%hhx:"
@@ -124 +124 @@
                 return EINVAL;
 
-        // set the processing parameters
+        /* Set processing parameters */
         switch (family) {
         case AF_INET:
@@ -142 +142 @@
         }
 
-        // erase if no address
+        /* Erase if no address */
         if (!address) {
                 bzero(data, count);
@@ -148 +148 @@
         }
 
-        // process the string from the beginning
+        /* Process string from the beginning */
         next = address;
         index = 0;
         do {
-                // if the actual character is set
+                /* If the actual character is set */
                 if (next && *next) {
 
-                        // if not on the first character
+                        /* If not on the first character */
                         if (index) {
-                                // move to the next character
+                                /* Move to the next character */
                                 ++next;
                         }
 
-                        // parse the actual integral value
+                        /* Parse the actual integral value */
                         value = strtoul(next, &last, base);
-                        // remember the last problematic character
-                        // should be either '.' or ':' but is ignored to be more
-                        // generic
+                        /*
+                         * Remember the last problematic character
+                         * should be either '.' or ':' but is ignored to be
+                         * more generic
+                         */
                         next = last;
 
-                        // fill the address data byte by byte
+                        /* Fill the address data byte by byte */
                         shift = bytes - 1;
                         do {
-                                // like little endian
+                                /* like little endian */
                                 data[index + shift] = value;
                                 value >>= 8;
@@ -178 +180 @@
                         index += bytes;
                 } else {
-                        // erase the rest of the address
+                        /* Erase the rest of the address */
                         bzero(data + index, count - index);
                         return EOK;