Changeset 8023571 in mainline for uspace/lib/libc

Timestamp:

2010-03-21T09:40:37Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c682dd1

Parents:

4e9aaf5 (diff), 19f857a (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 dev/misc.

Location:

uspace/lib/libc

Files:

• Makefile (modified) (1 diff)
• generic/adt/hash_table.c (modified) (1 diff)
• generic/clipboard.c (modified) (1 diff)
• generic/devmap.c (modified) (1 diff)
• generic/getopt.c (modified) (1 diff)
• generic/io/asprintf.c (modified) (1 diff)
• generic/io/io.c (modified) (1 diff)
• generic/io/klog.c (modified) (1 diff)
• generic/io/printf_core.c (modified) (1 diff)
• generic/io/vprintf.c (modified) (1 diff)
• generic/io/vsnprintf.c (modified) (1 diff)
• generic/loader.c (modified) (1 diff)
• generic/str.c (moved) (moved from uspace/lib/libc/generic/string.c ) (2 diffs)
• generic/sysinfo.c (modified) (1 diff)
• generic/task.c (modified) (1 diff)
• generic/thread.c (modified) (1 diff)
• generic/tls.c (modified) (1 diff)
• generic/vfs/vfs.c (modified) (1 diff)
• include/stdio.h (modified) (1 diff)
• include/str.h (moved) (moved from uspace/lib/libc/include/string.h ) (1 diff)
• include/sysinfo.h (modified) (1 diff)

uspace/lib/libc/Makefile

@@ -56 +56 @@
         generic/errno.c \
         generic/mem.c \
-        generic/string.c \
+        generic/str.c \
         generic/fibril.c \
         generic/fibril_synch.c \

uspace/lib/libc/generic/adt/hash_table.c

@@ -43 +43 @@
 #include <assert.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 
 /** Create chained hash table.

uspace/lib/libc/generic/clipboard.c

@@ -42 +42 @@
 #include <ipc/clipboard.h>
 #include <async.h>
-#include <string.h>
+#include <str.h>
 #include <errno.h>
 #include <malloc.h>

uspace/lib/libc/generic/devmap.c

@@ -28 +28 @@
  */
 
-#include <string.h>
+#include <str.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>

uspace/lib/libc/generic/getopt.c

@@ -38 +38 @@
 #include <getopt.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 
 /* HelenOS Port : We're incorporating only the modern getopt_long with wrappers

uspace/lib/libc/generic/io/asprintf.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <io/printf_core.h>
 

uspace/lib/libc/generic/io/io.c

@@ -37 +37 @@
 #include <fcntl.h>
 #include <assert.h>
-#include <string.h>
+#include <str.h>
 #include <errno.h>
 #include <bool.h>

uspace/lib/libc/generic/io/klog.c

@@ -35 +35 @@
 
 #include <libc.h>
-#include <string.h>
+#include <str.h>
 #include <sys/types.h>
 #include <unistd.h>

uspace/lib/libc/generic/io/printf_core.c

@@ -41 +41 @@
 #include <io/printf_core.h>
 #include <ctype.h>
-#include <string.h>
+#include <str.h>
 
 /** show prefixes 0x or 0 */

uspace/lib/libc/generic/io/vprintf.c

@@ -39 +39 @@
 #include <futex.h>
 #include <async.h>
-#include <string.h>
+#include <str.h>
 
 static atomic_t printf_futex = FUTEX_INITIALIZER;

uspace/lib/libc/generic/io/vsnprintf.c

@@ -35 +35 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include <io/printf_core.h>
 #include <errno.h>

uspace/lib/libc/generic/loader.c

@@ -38 +38 @@
 #include <libc.h>
 #include <task.h>
-#include <string.h>
+#include <str.h>
 #include <stdlib.h>
 #include <async.h>

uspace/lib/libc/generic/str.c

@@ -34 +34 @@
  */
 
-#include <string.h>
+#include <str.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -43 +43 @@
 #include <align.h>
 #include <mem.h>
-#include <string.h>
+#include <str.h>
 
 /** Byte mask consisting of lowest @n bits (out of 8) */

uspace/lib/libc/generic/sysinfo.c

@@ -35 +35 @@
 #include <libc.h>
 #include <sysinfo.h>
-#include <string.h>
+#include <str.h>
 
 sysarg_t sysinfo_value(const char *name)

uspace/lib/libc/generic/task.c

@@ -39 +39 @@
 #include <errno.h>
 #include <loader/loader.h>
-#include <string.h>
+#include <str.h>
 #include <ipc/ns.h>
 #include <macros.h>

uspace/lib/libc/generic/thread.c

@@ -39 +39 @@
 #include <kernel/proc/uarg.h>
 #include <fibril.h>
-#include <string.h>
+#include <str.h>
 #include <async.h>
 

uspace/lib/libc/generic/tls.c

@@ -40 +40 @@
 #include <tls.h>
 #include <malloc.h>
-#include <string.h>
+#include <str.h>
 #include <align.h>
 

uspace/lib/libc/generic/vfs/vfs.c

@@ -49 +49 @@
 #include <futex.h>
 #include <errno.h>
-#include <string.h>
+#include <str.h>
 #include <devmap.h>
 #include <ipc/vfs.h>

uspace/lib/libc/include/stdio.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <stdarg.h>
-#include <string.h>
+#include <str.h>
 #include <adt/list.h>
 

uspace/lib/libc/include/str.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_STRING_H_
-#define LIBC_STRING_H_
+#ifndef LIBC_STR_H_
+#define LIBC_STR_H_
 
 #include <mem.h>

uspace/lib/libc/include/sysinfo.h

@@ -38 +38 @@
 #include <libc.h>
 #include <sysinfo.h>
-#include <string.h>
+#include <str.h>
 
 sysarg_t sysinfo_value(const char *name);