Changeset 30c4005 in mainline for uspace/lib/c/include

Timestamp:

2011-04-29T19:56:07Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

2874547

Parents:

6b40ea7 (diff), afdcc60e (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 mainline improvements

Location:

uspace/lib/c/include

Files:

• assert.h (modified) (3 diffs)
• errno.h (modified) (1 diff)
• fibril_synch.h (modified) (2 diffs)
• macros.h (modified) (1 diff)
• str.h (modified) (1 diff)

uspace/lib/c/include/assert.h

@@ -40 +40 @@
  *
  * If NDEBUG is not set, the assert() macro
- * evaluates expr and if it is false prints 
+ * evaluates expr and if it is false prints
  * error message and terminate program.
  *
@@ -47 +47 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #ifndef NDEBUG
 
 #define assert(expr) \
         do { \
-                if (!(expr)) { \
-                        printf("Assertion failed (%s) at file '%s', " \
-                            "line %d.\n", #expr, __FILE__, __LINE__); \
-                        abort(); \
-                } \
+                if (!(expr)) \
+                        assert_abort(#expr, __FILE__, __LINE__); \
         } while (0)
 
@@ -67 +61 @@
 #endif /* NDEBUG */
 
+extern void assert_abort(const char *, const char *, unsigned int)
+    __attribute__((noreturn));
+
 #endif
 

uspace/lib/c/include/errno.h

@@ -39 +39 @@
 #include <fibril.h>
 
-#define errno _errno
+#define errno  (*(__errno()))
 
-extern int _errno;
+extern int *__errno(void) __attribute__((const));
 
 #define EMFILE        (-18)

uspace/lib/c/include/fibril_synch.h

@@ -36 +36 @@
 #define LIBC_FIBRIL_SYNCH_H_
 
-#include <async.h>
 #include <fibril.h>
 #include <adt/list.h>
 #include <libarch/tls.h>
 #include <sys/time.h>
+#include <bool.h>
 
 typedef struct {
-        fibril_owner_info_t oi;         /* Keep this the first thing. */
+        fibril_owner_info_t oi;  /**< Keep this the first thing. */
         int counter;
         link_t waiters;
@@ -64 +64 @@
 
 typedef struct {
-        fibril_owner_info_t oi; /* Keep this the first thing. */
+        fibril_owner_info_t oi;  /**< Keep this the first thing. */
         unsigned writers;
         unsigned readers;

uspace/lib/c/include/macros.h

@@ -39 +39 @@
 #define max(a, b)  ((a) > (b) ? (a) : (b))
 
-#define SIZE2KB(size)  ((size) >> 10)
-#define SIZE2MB(size)  ((size) >> 20)
-
-#define KB2SIZE(kb)  ((kb) << 10)
-#define MB2SIZE(mb)  ((mb) << 20)
+#define KiB2SIZE(kb)  ((kb) << 10)
+#define MiB2SIZE(mb)  ((mb) << 20)
 
 #define STRING(arg)      STRING_ARG(arg)

uspace/lib/c/include/str.h

@@ -89 +89 @@
 extern int str_size_t(const char *, char **, unsigned int, bool, size_t *);
 
-extern void order_suffix(const uint64_t val, uint64_t *rv, char *suffix);
+extern void order_suffix(const uint64_t, uint64_t *, char *);
+extern void bin_order_suffix(const uint64_t, uint64_t *, const char **, bool);
 
 /*