Changeset d4d74dc in mainline

Timestamp:

2012-04-03T12:29:36Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a92f13d

Parents:

bb1b44e

Message:

Less includes in library headers

There is no need for errno.h to include fibril.h.
Similarly, tinput.h does not need list.h or async.h.

Unfortunately, many programs depended on the fact that including
errno.h would (recursively) include unistd.h and NULL would be
defined. Most of the fixes remedy this problem.

Location:

uspace

Files:

• app/killall/killall.c (modified) (1 diff)
• app/nettest1/nettest1.c (modified) (1 diff)
• app/nettest2/nettest2.c (modified) (1 diff)
• app/sbi/src/mytypes.h (modified) (1 diff)
• app/sysinfo/sysinfo.c (modified) (1 diff)
• app/websrv/websrv.c (modified) (1 diff)
• drv/bus/usb/ohci/utils/malloc32.h (modified) (1 diff)
• drv/bus/usb/uhci/utils/malloc32.h (modified) (1 diff)
• lib/c/generic/stacktrace.c (modified) (1 diff)
• lib/c/generic/stats.c (modified) (1 diff)
• lib/c/generic/sysinfo.c (modified) (1 diff)
• lib/c/generic/time.c (modified) (1 diff)
• lib/c/include/errno.h (modified) (1 diff)
• lib/c/include/stdio.h (modified) (1 diff)
• lib/clui/tinput.h (modified) (1 diff)
• lib/drv/generic/logbuf.c (modified) (1 diff)
• lib/drv/include/ddf/interrupt.h (modified) (1 diff)
• lib/posix/pwd.c (modified) (1 diff)
• lib/posix/time.c (modified) (1 diff)
• srv/fs/fat/fat_dentry.c (modified) (1 diff)

uspace/app/killall/killall.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <task.h>
 #include <stats.h>

uspace/app/nettest1/nettest1.c

@@ -40 +40 @@
 #include <malloc.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <str.h>
 #include <task.h>

uspace/app/nettest2/nettest2.c

@@ -40 +40 @@
 #include <malloc.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <str.h>
 #include <task.h>

uspace/app/sbi/src/mytypes.h

@@ -51 +51 @@
 /** Error return codes. */
 #include <errno.h>
+/** We need NULL defined. */
+#include <unistd.h>
 #define EOK 0
 

uspace/app/sysinfo/sysinfo.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <sysinfo.h>
 #include <malloc.h>

uspace/app/websrv/websrv.c

@@ -36 +36 @@
 #include <bool.h>
 #include <errno.h>
+#include <assert.h>
 #include <stdio.h>
 #include <sys/types.h>

uspace/drv/bus/usb/ohci/utils/malloc32.h

@@ -37 +37 @@
 #include <assert.h>
 #include <malloc.h>
+#include <unistd.h>
 #include <errno.h>
 #include <mem.h>

uspace/drv/bus/usb/uhci/utils/malloc32.h

@@ -36 +36 @@
 
 #include <assert.h>
+#include <unistd.h>
 #include <errno.h>
 #include <malloc.h>

uspace/lib/c/generic/stacktrace.c

@@ -38 +38 @@
 #include <sys/types.h>
 #include <errno.h>
+#include <unistd.h>
 
 static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data);

uspace/lib/c/generic/stats.c

@@ -40 +40 @@
 #include <inttypes.h>
 #include <malloc.h>
+#include <unistd.h>
 
 #define SYSINFO_STATS_MAX_PATH  64

uspace/lib/c/generic/sysinfo.c

@@ -39 +39 @@
 #include <malloc.h>
 #include <bool.h>
+#include <unistd.h>
 
 /** Get sysinfo keys size

uspace/lib/c/generic/time.c

@@ -43 +43 @@
 #include <ddi.h>
 #include <libc.h>
+#include <unistd.h>
 
 /** Pointer to kernel shared variables with time */

uspace/lib/c/include/errno.h

@@ -37 +37 @@
 
 #include <abi/errno.h>
-#include <fibril.h>
 
 #define errno  (*(__errno()))

uspace/lib/c/include/stdio.h

@@ -39 +39 @@
 #include <stdarg.h>
 #include <str.h>
-#include <adt/list.h>
 
 #ifndef NVERIFY_PRINTF

uspace/lib/clui/tinput.h

@@ -37 +37 @@
 #define LIBCLUI_TINPUT_H_
 
-#include <adt/list.h>
-#include <async.h>
 #include <inttypes.h>
 #include <io/console.h>

uspace/lib/drv/generic/logbuf.c

@@ -35 +35 @@
 #include <ddf/log.h>
 #include <assert.h>
+#include <unistd.h>
 
 /** Formatting string for printing number of not-printed items. */

uspace/lib/drv/include/ddf/interrupt.h

@@ -36 +36 @@
 #define DDF_INTERRUPT_H_
 
+#include <libarch/common.h>
+#include <libarch/types.h>
 #include <abi/ddi/irq.h>
 #include <adt/list.h>

uspace/lib/posix/pwd.c

@@ -38 +38 @@
 #include "string.h"
 #include "errno.h"
+#include "assert.h"
 
 static bool entry_read = false;

uspace/lib/posix/time.c

@@ -45 +45 @@
 #include "errno.h"
 #include "signal.h"
+#include "assert.h"
 
 #include "libc/malloc.h"

uspace/srv/fs/fat/fat_dentry.c

@@ -43 +43 @@
 #include <byteorder.h>
 #include <assert.h>
+#include <unistd.h>
 
 /** Compare path component with the name read from the dentry.