libc: Change bits/macros.h to use a __lc_ prefix for internal macros
That way, we don't pollute user programs with our own 'noreturn' and 'deprecated' macros
This commit is contained in:
parent
1043b0772d
commit
8398b2e2e4
@ -1,8 +1,8 @@
|
|||||||
#ifndef _BITS_MACROS_H
|
#ifndef _BITS_MACROS_H
|
||||||
#define _BITS_MACROS_H
|
#define _BITS_MACROS_H
|
||||||
|
|
||||||
#define noreturn __attribute__((noreturn))
|
#define __lc_noreturn __attribute__((noreturn))
|
||||||
#define align(n) __attribute__((aligned(n)))
|
#define __lc_align(n) __attribute__((aligned(n)))
|
||||||
#define deprecated(msg) __attribute__((deprecated(msg)))
|
#define __lc_deprecated(msg) __attribute__((deprecated(msg)))
|
||||||
|
|
||||||
#endif
|
#endif
|
@ -16,7 +16,7 @@ extern "C"
|
|||||||
unsigned int msleep(unsigned int ms);
|
unsigned int msleep(unsigned int ms);
|
||||||
|
|
||||||
/* Prints a message to standard error and aborts the program. */
|
/* Prints a message to standard error and aborts the program. */
|
||||||
noreturn void __luna_abort(const char* message);
|
__lc_noreturn void __luna_abort(const char* message);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
@ -10,10 +10,10 @@ extern "C"
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Aborts the program. */
|
/* Aborts the program. */
|
||||||
noreturn void abort();
|
__lc_noreturn void abort();
|
||||||
|
|
||||||
/* Normally exits the program with the specified status code. */
|
/* Normally exits the program with the specified status code. */
|
||||||
noreturn void exit(int status);
|
__lc_noreturn void exit(int status);
|
||||||
|
|
||||||
/* Registers a handler function to be run at normal program termination. */
|
/* Registers a handler function to be run at normal program termination. */
|
||||||
int atexit(void (*handler)(void));
|
int atexit(void (*handler)(void));
|
||||||
|
@ -22,7 +22,7 @@ extern "C"
|
|||||||
size_t strlen(const char* str);
|
size_t strlen(const char* str);
|
||||||
|
|
||||||
/* Copies the string src into dest. This function is unsafe, use strncpy instead. */
|
/* Copies the string src into dest. This function is unsafe, use strncpy instead. */
|
||||||
deprecated("strcpy is unsafe and should not be used; use strncpy instead") char* strcpy(char* dest,
|
__lc_deprecated("strcpy is unsafe and should not be used; use strncpy instead") char* strcpy(char* dest,
|
||||||
const char* src);
|
const char* src);
|
||||||
|
|
||||||
/* Copies at most max bytes from the string src into dest. */
|
/* Copies at most max bytes from the string src into dest. */
|
||||||
@ -32,7 +32,7 @@ extern "C"
|
|||||||
char* strchr(const char* str, int c);
|
char* strchr(const char* str, int c);
|
||||||
|
|
||||||
/* Concatenates the string src into dest. This function is unsafe, use strncat instead. */
|
/* Concatenates the string src into dest. This function is unsafe, use strncat instead. */
|
||||||
deprecated("strcat is unsafe and should not be used; use strncat instead") char* strcat(char* dest,
|
__lc_deprecated("strcat is unsafe and should not be used; use strncat instead") char* strcat(char* dest,
|
||||||
const char* src);
|
const char* src);
|
||||||
|
|
||||||
/* Concatenates at most max bytes of the string src into dest. */
|
/* Concatenates at most max bytes of the string src into dest. */
|
||||||
|
@ -25,7 +25,7 @@ extern "C"
|
|||||||
pid_t fork(void);
|
pid_t fork(void);
|
||||||
|
|
||||||
/* Terminates the program with the status code status. */
|
/* Terminates the program with the status code status. */
|
||||||
noreturn void _exit(int status);
|
__lc_noreturn void _exit(int status);
|
||||||
|
|
||||||
/* Calls the kernel for a specific service, determined by number. */
|
/* Calls the kernel for a specific service, determined by number. */
|
||||||
long syscall(long number, ...);
|
long syscall(long number, ...);
|
||||||
|
@ -17,7 +17,7 @@ extern "C"
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
noreturn void exit(int status)
|
__lc_noreturn void exit(int status)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < atexit_function_count; i++) { atexit_functions[i](); }
|
for (int i = 0; i < atexit_function_count; i++) { atexit_functions[i](); }
|
||||||
_exit(status);
|
_exit(status);
|
||||||
|
@ -17,7 +17,7 @@ extern "C"
|
|||||||
return (unsigned int)syscall(SYS_sleep, ms);
|
return (unsigned int)syscall(SYS_sleep, ms);
|
||||||
}
|
}
|
||||||
|
|
||||||
noreturn void __luna_abort(const char* message)
|
__lc_noreturn void __luna_abort(const char* message)
|
||||||
{
|
{
|
||||||
fputs(message, stderr);
|
fputs(message, stderr);
|
||||||
abort();
|
abort();
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
noreturn void abort()
|
__lc_noreturn void abort()
|
||||||
{
|
{
|
||||||
_exit(-1);
|
_exit(-1);
|
||||||
}
|
}
|
||||||
|
@ -96,7 +96,7 @@ extern "C"
|
|||||||
return syscall(SYS_seek, fd, offset, whence);
|
return syscall(SYS_seek, fd, offset, whence);
|
||||||
}
|
}
|
||||||
|
|
||||||
noreturn void _exit(int status)
|
__lc_noreturn void _exit(int status)
|
||||||
{
|
{
|
||||||
syscall(SYS_exit, status);
|
syscall(SYS_exit, status);
|
||||||
__builtin_unreachable();
|
__builtin_unreachable();
|
||||||
|
Loading…
Reference in New Issue
Block a user