cvsignore

[pintos-anon] / src / lib / lib.h

diff --git a/src/lib/lib.h b/src/lib/lib.h
index f6ae7c4ab373e591159f01c2323b29a38f3b32bd..8883cf71da155018031cbb53db3004086e3c5f23 100644 (file)
--- a/src/lib/lib.h
+++ b/src/lib/lib.h
@@ -2,13 +2,11 @@
 #define HEADER_LIB_H 1
 
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include "debug.h"
 
-#define ROUND_UP(X, STEP) (((X) + (STEP) - 1) / (STEP) * (STEP))
-#define DIV_ROUND_UP(X, STEP) (((X) + (STEP) - 1) / (STEP))
-#define ROUND_DOWN(X, STEP) ((X) / (STEP) * (STEP))
-
+/* <string.h> */
 void *memset (void *, int, size_t);
 void *memcpy (void *, const void *, size_t);
 void *memmove (void *, const void *, size_t);
@@ -18,20 +16,53 @@ int memcmp (const void *, const void *, size_t);
 char *strchr (const char *, int);
 size_t strlcpy (char *, const char *, size_t);
 size_t strlen (const char *);
+size_t strnlen (const char *, size_t);
+int strcmp (const char *, const char *);
+char *strtok_r (char *, const char *, char **);
 
-void vprintk (const char *, va_list);
-void printk (const char *, ...) PRINTF_FORMAT (1, 2);
-int vsnprintf (char *, size_t, const char *, va_list);
-int snprintf (char *, size_t, const char *, ...) PRINTF_FORMAT (3, 4);
+/* <stdlib.h> */
+int atoi (const char *);
 
-void hex_dump (const void *, size_t size);
+/* <stdio.h> */
+int vsnprintf (char *, size_t, const char *, va_list) PRINTF_FORMAT (3, 0);
+int snprintf (char *, size_t, const char *, ...) PRINTF_FORMAT (3, 4);
 
-static inline int isdigit (int c) { return c >= '0' && c <= '9'; }
-static inline int isprint (int c) { return c >= 32 && c < 127; }
-static inline int isgraph (int c) { return c >= 33 && c < 127; }
-static inline int isspace (int c) { return strchr (" \t\n\r\v", c) != NULL; }
+/* <ctype.h> */
 static inline int islower (int c) { return c >= 'a' && c <= 'z'; }
 static inline int isupper (int c) { return c >= 'A' && c <= 'Z'; }
 static inline int isalpha (int c) { return islower (c) || isupper (c); }
+static inline int isdigit (int c) { return c >= '0' && c <= '9'; }
+static inline int isalnum (int c) { return isalpha (c) || isdigit (c); }
+static inline int isxdigit (int c) {
+  return isdigit (c) || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
+}
+static inline int isspace (int c) { return strchr (" \f\n\r\t\v", c) != NULL; }
+static inline int isgraph (int c) { return c >= 33 && c < 127; }
+static inline int isprint (int c) { return c >= 32 && c < 127; }
+static inline int iscntrl (int c) { return c >= 0 && c < 32; }
+static inline int isascii (int c) { return c >= 0 && c < 128; }
+static inline int ispunct (int c) {
+  return isprint (c) && !isalnum (c) && !isspace (c);
+}
+\f
+/* Nonstandard. */
+
+/* Yields X rounded up to the nearest multiple of STEP.
+   For X >= 0, STEP >= 1 only. */
+#define ROUND_UP(X, STEP) (((X) + (STEP) - 1) / (STEP) * (STEP))
+
+/* Yields X divided by STEP, rounded up.
+   For X >= 0, STEP >= 1 only. */
+#define DIV_ROUND_UP(X, STEP) (((X) + (STEP) - 1) / (STEP))
+
+/* Yields X rounded down to the nearest multiple of STEP.
+   For X >= 0, STEP >= 1 only. */
+#define ROUND_DOWN(X, STEP) ((X) / (STEP) * (STEP))
+
+/* There is no DIV_ROUND_DOWN.   It would be simply X / STEP. */
+
+void vprintk (const char *, va_list) PRINTF_FORMAT (1, 0);
+void printk (const char *, ...) PRINTF_FORMAT (1, 2);
+void hex_dump (const void *, size_t size, bool ascii);
 
 #endif /* lib.h */