Changeset ac02aaa in mainline

Timestamp:

2008-09-14T11:00:31Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

693f614

Parents:

9f3363e

Message:

Implement memmove() for the use in the boot component.

Location:

boot/generic

Files:

• string.c (modified) (9 diffs)
• string.h (modified) (1 diff)

boot/generic/string.c

@@ -40 +40 @@
 /** Return number of characters in a string.
  *
- * @param str NULL terminated string.
- *
- * @return Number of characters in str.
+ * @param str           NULL terminated string.
+ *
+ * @return              Number of characters in str.
  */
 size_t strlen(const char *str)
@@ -54 +54 @@
 }
 
-/** Compare two NULL terminated strings
+/** Compare two NULL terminated strings.
  *
  * Do a char-by-char comparison of two NULL terminated strings.
@@ -60 +60 @@
  * characters on the minimum of their lengths.
  *
- * @param src First string to compare.
- * @param dst Second string to compare.
- *
- * @return 0 if the strings are equal, -1 if first is smaller, 1 if second smaller.
+ * @param src           First string to compare.
+ * @param dst           Second string to compare.
+ *
+ * @return              0 if the strings are equal, -1 if first is smaller,
+ *                      1 if second smaller.
  *
  */
@@ -82 +83 @@
 
 
-/** Compare two NULL terminated strings
+/** Compare two NULL terminated strings.
  *
  * Do a char-by-char comparison of two NULL terminated strings.
@@ -89 +90 @@
  * length.
  *
- * @param src First string to compare.
- * @param dst Second string to compare.
- * @param len Maximal length for comparison.
- *
- * @return 0 if the strings are equal, -1 if first is smaller, 1 if second smaller.
+ * @param src           First string to compare.
+ * @param dst           Second string to compare.
+ * @param len           Maximal length for comparison.
+ *
+ * @return              0 if the strings are equal, -1 if first is smaller,
+ *                      1 if second smaller.
  *
  */
@@ -119 +121 @@
  * last copied character.
  *
- * @param src Source string.
- * @param dest Destination buffer.
- * @param len Size of destination buffer.
+ * @param src           Source string.
+ * @param dest          Destination buffer.
+ * @param len           Size of destination buffer.
  */
 void strncpy(char *dest, const char *src, size_t len)
@@ -133 +135 @@
 }
 
-/** Convert ascii representation to unative_t
+/** Convert ascii representation to unative_t.
  *
  * Supports 0x for hexa & 0 for octal notation.
  * Does not check for overflows, does not support negative numbers
  *
- * @param text Textual representation of number
- * @return Converted number or 0 if no valid number ofund 
+ * @param text          Textual representation of number.
+ * @return              Converted number or 0 if no valid number found.
  */
 unative_t atoi(const char *text)
@@ -153 +155 @@
 
         while (*text) {
-                if (base != 16 && \
-                    ((*text >= 'A' && *text <= 'F' )
-                     || (*text >='a' && *text <='f')))
+                if (base != 16 &&
+                    ((*text >= 'A' && *text <= 'F') ||
+                    (*text >='a' && *text <='f')))
                         break;
                 if (base == 8 && *text >='8')
@@ -177 +179 @@
 }
 
+/** Move piece of memory to another, possibly overlapping, location.
+ *
+ * @param dst           Destination address.
+ * @param src           Source address.
+ * @param len           Number of bytes to move.
+ *
+ * @return              Destination address.
+ */
+void *memmove(void *dst, const void *src, size_t len)
+{
+        char *d = dst;
+        const char *s = src;
+        if (s < d) {
+                while (len--)
+                        *(d + len) = *(s + len);
+        } else {
+                while (len--)
+                        *d++ = *s++;
+        }
+        
+        return dst;
+}
+
 /** @}
  */

boot/generic/string.h

@@ -43 +43 @@
 extern void strncpy(char *dest, const char *src, size_t len);
 extern unative_t atoi(const char *text);
+extern void *memmove(void *dst, const void *src, size_t len);
 
 #endif