Changeset 561db3f in mainline

Timestamp:

2009-03-02T22:46:52Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

2f57690

Parents:

20f1597

Message:

Didn't need strrcpy() afterall. Also remove strcpy() since strncpy() is better.

Location:

kernel/generic

Files:

• include/string.h (modified) (1 diff)
• src/lib/string.c (modified) (2 diffs)
• src/proc/task.c (modified) (1 diff)

kernel/generic/include/string.h

@@ -42 +42 @@
 extern int strncmp(const char *src, const char *dst, size_t len);
 extern void strncpy(char *dest, const char *src, size_t len);
-extern char *strcpy(char *dest, const char *src);
 
 extern char *strchr(const char *s, int i);
-extern char *strrchr(const char *s, int i);
 
 #endif

kernel/generic/src/lib/string.c

@@ -142 +142 @@
 }
 
-/** Copy string.
- *
- * Copy string from src address to dst address.  The copying is done
- * char-by-char until the null character. The source and destination memory
- * areas cannot overlap.
- *
- * @param src           Source string to copy from.
- * @param dst           Destination string to copy to.
- *
- * @return              Address of the destination string.
- */
-char *strcpy(char *dest, const char *src)
-{
-        char *orig = dest;
-        
-        while ((*dest++ = *src++) != '\0');
-
-        return orig;
-}
-
 /** Find first occurence of character in string.
  *
@@ -179 +159 @@
 }
 
-/** Find last occurence of character in string.
- *
- * @param s     String to search.
- * @param i     Character to look for.
- *
- * @return      Pointer to character in @a s or NULL if not found.
- */
-extern char *strrchr(const char *s, int i)
-{
-        const char *start;
-
-        start = s;
-        if (*s == '\0') return NULL;
-
-        while (*s != '\0') ++s;
-
-        while (s != start) {
-                --s;
-                if (*s == i) return (char *) s;
-        }
-
-        return NULL;
-}
-
 /** @}
  */

kernel/generic/src/proc/task.c

@@ -275 +275 @@
 
         namebuf[name_len] = '\0';
-        strcpy(TASK->name, namebuf);
+        strncpy(TASK->name, namebuf, TASK_NAME_BUFLEN);
 
         return EOK;