Changeset db24058 in mainline for uspace/lib/libc/include

Timestamp:

2009-06-30T15:53:15Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2d11a7d8

Parents:

6db6fd1

Message:

small fixes and coding style changes related to the new memory allocator

Location:

uspace/lib/libc/include

Files:

• adt/gcdlcm.h (added)
• async.h (modified) (2 diffs)
• bitops.h (modified) (4 diffs)
• errno.h (modified) (1 diff)
• getopt.h (modified) (1 diff)
• macros.h (modified) (1 diff)
• mem.h (modified) (1 diff)
• stdio.h (modified) (2 diffs)
• stdlib.h (modified) (2 diffs)
• unistd.h (modified) (1 diff)
• vfs/vfs.h (modified) (1 diff)

uspace/lib/libc/include/async.h

@@ -47 +47 @@
 extern atomic_t async_futex;
 
+extern int __async_init(void);
+extern ipc_callid_t async_get_call_timeout(ipc_call_t *call, suseconds_t usecs);
+
+static inline ipc_callid_t async_get_call(ipc_call_t *data)
+{
+        return async_get_call_timeout(data, 0);
+}
+
 static inline void async_manager(void)
 {
         fibril_switch(FIBRIL_TO_MANAGER);
-}
-
-extern ipc_callid_t async_get_call_timeout(ipc_call_t *call, suseconds_t usecs);
-
-static inline ipc_callid_t async_get_call(ipc_call_t *data)
-{
-        return async_get_call_timeout(data, 0);
 }
 
@@ -95 +96 @@
 extern void async_create_manager(void);
 extern void async_destroy_manager(void);
-extern int _async_init(void);
 
 extern void async_set_client_connection(async_client_conn_t conn);

uspace/lib/libc/include/bitops.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -43 +43 @@
  * If number is zero, it returns 0
  */
-static inline int fnzb32(uint32_t arg)
+static inline unsigned int fnzb32(uint32_t arg)
 {
-        int n = 0;
-
+        unsigned int n = 0;
+        
         if (arg >> 16) {
                 arg >>= 16;
@@ -75 +75 @@
 }
 
-static inline int fnzb64(uint64_t arg)
+static inline unsigned int fnzb64(uint64_t arg)
 {
-        int n = 0;
-
+        unsigned int n = 0;
+        
         if (arg >> 32) {
                 arg >>= 32;
@@ -84 +84 @@
         }
         
-        return n + fnzb32((uint32_t) arg);
+        return (n + fnzb32((uint32_t) arg));
 }
 
-#define fnzb(x) fnzb32(x)
+static inline unsigned int fnzb(size_t arg)
+{
+        return fnzb64(arg);
+}
 
 #endif

uspace/lib/libc/include/errno.h

@@ -36 +36 @@
 #define LIBC_ERRNO_H_
 
-/* TODO: support threads/fibrils */
+#include <kernel/errno.h>
+#include <fibril.h>
+
 extern int _errno;
+
 #define errno _errno
-
-#include <kernel/errno.h>
 
 #define EMFILE        (-17)

uspace/lib/libc/include/getopt.h

@@ -59 +59 @@
 
 /* HelenOS Port - These need to be exposed for legacy getopt() */
-extern char *optarg;
+extern const char *optarg;
 extern int optind, opterr, optopt;
 extern int optreset;

uspace/lib/libc/include/macros.h

@@ -36 +36 @@
 #define LIBC_MACROS_H_
 
+#define min(a, b)  ((a) < (b) ? (a) : (b))
+#define max(a, b)  ((a) > (b) ? (a) : (b))
+
 #define SIZE2KB(size)  ((size) >> 10)
 #define SIZE2MB(size)  ((size) >> 20)

uspace/lib/libc/include/mem.h

@@ -40 +40 @@
 #define bzero(ptr, len)  memset((ptr), 0, (len))
 
-extern void * memset(void *, int, size_t);
-extern void * memcpy(void *, const void *, size_t);
-extern void * memmove(void *, const void *, size_t);
+extern void *memset(void *, int, size_t);
+extern void *memcpy(void *, const void *, size_t);
+extern void *memmove(void *, const void *, size_t);
 
 extern int bcmp(const char *, const char *, size_t);

uspace/lib/libc/include/stdio.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <stdarg.h>
+#include <string.h>
 #include <adt/list.h>
 
@@ -43 +44 @@
 
 /** Default size for stream I/O buffers */
-#define BUFSIZ 4096
+#define BUFSIZ  4096
 
 #define DEBUG(fmt, ...) \
-{ \
-        char buf[256]; \
-        int n = snprintf(buf, sizeof(buf), fmt, ##__VA_ARGS__); \
-        if (n > 0) \
-                (void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, str_size(buf)); \
-}
+        { \
+                char _buf[256]; \
+                int _n = snprintf(_buf, sizeof(_buf), fmt, ##__VA_ARGS__); \
+                if (_n > 0) \
+                        (void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) _buf, str_size(_buf)); \
+        }
 
 #ifndef SEEK_SET

uspace/lib/libc/include/stdlib.h

@@ -39 +39 @@
 #include <malloc.h>
 
-#define abort() _exit(1)
-#define exit(status)    _exit((status))
+#define abort()       _exit(1)
+#define exit(status)  _exit((status))
 
-#define RAND_MAX 714025
+#define RAND_MAX  714025
 
 extern long int random(void);
@@ -51 +51 @@
         return random();
 }
+
 static inline void srand(unsigned int seed)
 {

uspace/lib/libc/include/unistd.h

@@ -66 +66 @@
 
 extern void _exit(int status) __attribute__ ((noreturn));
-extern void *sbrk(ssize_t incr);
 extern int usleep(unsigned long usec);
 extern unsigned int sleep(unsigned int seconds);

uspace/lib/libc/include/vfs/vfs.h

@@ -56 +56 @@
     unsigned int);
 
-extern void stdio_init(int filc, fdi_node_t *filv[]);
-extern void stdio_done(void);
+extern void __stdio_init(int filc, fdi_node_t *filv[]);
+extern void __stdio_done(void);
 
 extern int open_node(fdi_node_t *, int);