cleanup: namespace Montauk (capital M) => montauk::abi
This commit is contained in:
@@ -218,7 +218,7 @@ inline void parse_key_value_lines(char* text, Fn fn) {
|
||||
|
||||
inline void now_string(char* out, int out_len) {
|
||||
if (out == nullptr || out_len <= 0) return;
|
||||
Montauk::DateTime dt = {};
|
||||
montauk::abi::DateTime dt = {};
|
||||
montauk::gettime(&dt);
|
||||
snprintf(out, (size_t)out_len, "%04d-%02d-%02d %02d:%02d:%02d",
|
||||
(int)dt.Year, (int)dt.Month, (int)dt.Day,
|
||||
@@ -1010,11 +1010,11 @@ inline bool daemon_is_running(int* out_pid) {
|
||||
|
||||
int handle = montauk::proc_open(pid);
|
||||
if (handle < 0) return false;
|
||||
uint32_t sig = montauk::wait_handle(handle, Montauk::IPC_SIGNAL_EXITED, 0);
|
||||
uint32_t sig = montauk::wait_handle(handle, montauk::abi::IPC_SIGNAL_EXITED, 0);
|
||||
montauk::close(handle);
|
||||
if (sig & Montauk::IPC_SIGNAL_EXITED) return false;
|
||||
if (sig & montauk::abi::IPC_SIGNAL_EXITED) return false;
|
||||
|
||||
Montauk::ProcInfo procs[128];
|
||||
montauk::abi::ProcInfo procs[128];
|
||||
int proc_count = montauk::proclist(procs, (int)(sizeof(procs) / sizeof(procs[0])));
|
||||
bool matched = false;
|
||||
for (int i = 0; i < proc_count; i++) {
|
||||
@@ -1289,9 +1289,9 @@ inline int send_all_plain(int fd, const uint8_t* data, int len) {
|
||||
if (n < 0) return -1;
|
||||
|
||||
uint32_t sig = montauk::wait_handle(fd,
|
||||
Montauk::IPC_SIGNAL_WRITABLE | Montauk::IPC_SIGNAL_PEER_CLOSED,
|
||||
montauk::abi::IPC_SIGNAL_WRITABLE | montauk::abi::IPC_SIGNAL_PEER_CLOSED,
|
||||
1000);
|
||||
if (sig & Montauk::IPC_SIGNAL_PEER_CLOSED) return -1;
|
||||
if (sig & montauk::abi::IPC_SIGNAL_PEER_CLOSED) return -1;
|
||||
if (montauk::get_milliseconds() >= deadline) return -1;
|
||||
montauk::sleep_ms(1);
|
||||
}
|
||||
@@ -1379,13 +1379,13 @@ inline int recv_http_plain(int fd, char* buf, int cap) {
|
||||
if (montauk::get_milliseconds() >= deadline) break;
|
||||
|
||||
uint32_t sig = montauk::wait_handle(fd,
|
||||
Montauk::IPC_SIGNAL_READABLE | Montauk::IPC_SIGNAL_PEER_CLOSED,
|
||||
montauk::abi::IPC_SIGNAL_READABLE | montauk::abi::IPC_SIGNAL_PEER_CLOSED,
|
||||
1000);
|
||||
if (sig == 0) continue;
|
||||
|
||||
if (sig & Montauk::IPC_SIGNAL_PEER_CLOSED)
|
||||
if (sig & montauk::abi::IPC_SIGNAL_PEER_CLOSED)
|
||||
peer_closed = true;
|
||||
if (!(sig & Montauk::IPC_SIGNAL_READABLE)) {
|
||||
if (!(sig & montauk::abi::IPC_SIGNAL_READABLE)) {
|
||||
if (peer_closed) break;
|
||||
continue;
|
||||
}
|
||||
@@ -1525,7 +1525,7 @@ inline bool ipp_http_post(const IppUri* uri,
|
||||
tas, raw, HTTP_RESPONSE_MAX - 1);
|
||||
if (tas.anchors) free(tas.anchors);
|
||||
} else {
|
||||
int fd = montauk::socket(Montauk::SOCK_TCP);
|
||||
int fd = montauk::socket(montauk::abi::SOCK_TCP);
|
||||
if (fd < 0) {
|
||||
free(raw);
|
||||
free(req);
|
||||
|
||||
Reference in New Issue
Block a user