Changeset 3aae4e8 in mainline for uspace/lib/socket/adt/measured_strings.c

Timestamp:

2010-04-04T22:07:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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 mainline changes.

File:

• uspace/lib/socket/adt/measured_strings.c (moved) (moved from uspace/srv/net/structures/measured_strings.c ) (3 diffs)

uspace/lib/socket/adt/measured_strings.c

@@ -43 +43 @@
 #include <ipc/ipc.h>
 
-#include "../err.h"
-#include "../modules.h"
-
-#include "measured_strings.h"
-
-/** Computes the lengths of the measured strings in the given array.
- *  @param[in] strings The measured strings array to be processed.
- *  @param[in] count The measured strings array size.
- *  @returns The computed sizes array.
- *  @returns NULL if there is not enough memory left.
- */
-size_t * prepare_lengths(const measured_string_ref strings, size_t count);
+#include <net_err.h>
+#include <net_modules.h>
+#include <adt/measured_strings.h>
 
 measured_string_ref measured_string_create_bulk(const char * string, size_t length){
@@ -157 +148 @@
 }
 
+/** Computes the lengths of the measured strings in the given array.
+ *  @param[in] strings The measured strings array to be processed.
+ *  @param[in] count The measured strings array size.
+ *  @returns The computed sizes array.
+ *  @returns NULL if there is not enough memory left.
+ */
+static size_t * prepare_lengths(const measured_string_ref strings, size_t count){
+        size_t * lengths;
+        size_t index;
+        size_t length;
+
+        lengths = (size_t *) malloc(sizeof(size_t) * (count + 1));
+        if(! lengths){
+                return NULL;
+        }
+        length = 0;
+        for(index = 0; index < count; ++ index){
+                lengths[index] = strings[index].length;
+                length += lengths[index] + 1;
+        }
+        lengths[count] = length;
+        return lengths;
+}
+
 int measured_strings_reply(const measured_string_ref strings, size_t count){
         ERROR_DECLARE;
@@ -265 +280 @@
 }
 
-size_t * prepare_lengths(const measured_string_ref strings, size_t count){
-        size_t * lengths;
-        size_t index;
-        size_t length;
-
-        lengths = (size_t *) malloc(sizeof(size_t) * (count + 1));
-        if(! lengths){
-                return NULL;
-        }
-        length = 0;
-        for(index = 0; index < count; ++ index){
-                lengths[index] = strings[index].length;
-                length += lengths[index] + 1;
-        }
-        lengths[count] = length;
-        return lengths;
-}
-
 /** @}
  */