diff options
Diffstat (limited to 'libc/inc')
| -rw-r--r-- | libc/inc/assert.h | 6 | ||||
| -rw-r--r-- | libc/inc/conv.h | 4 | ||||
| -rw-r--r-- | libc/inc/cpu.h | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/libc/inc/assert.h b/libc/inc/assert.h index f4fa4b4..3e45f44 100644 --- a/libc/inc/assert.h +++ b/libc/inc/assert.h @@ -10,9 +10,9 @@ #define assert(exp) \ if (!(exp)) { \ printf("%s:%d: %s: Assertion '%s' failed\n", __FILE__, __LINE__, __func__, #exp); \ - struct proc *proc = proc_current(); \ - if (proc) \ - proc_exit(proc, 1); \ + struct proc *assert_proc = proc_current(); \ + if (assert_proc) \ + proc_exit(assert_proc, 1); \ else \ __asm__ volatile("cli\nhlt"); \ } diff --git a/libc/inc/conv.h b/libc/inc/conv.h index d878deb..adf9003 100644 --- a/libc/inc/conv.h +++ b/libc/inc/conv.h @@ -5,9 +5,9 @@ #include <def.h> -int atoi(char *str); +int atoi(const char *str); char *htoa(u32 n); -int htoi(char *str); +int htoi(const char *str); char *itoa(int n); char *conv_base(int value, char *result, int base, int is_signed); diff --git a/libc/inc/cpu.h b/libc/inc/cpu.h index e742390..033743d 100644 --- a/libc/inc/cpu.h +++ b/libc/inc/cpu.h @@ -18,14 +18,14 @@ void outl(u16 port, u32 data); void cpuid(int code, u32 *a, u32 *b, u32 *c, u32 *d); char *cpu_string(char buf[12]); -void cpu_print(); +void cpu_print(void); #ifdef kernel -void cli(); -void sti(); -void hlt(); -void idle(); -void loop(); +void cli(void); +void sti(void); +void hlt(void); +void idle(void); +void loop(void); #endif static inline void spinlock(int *ptr) |