diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-26 18:18:01 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-26 20:45:30 -0700 |
| commit | ec21450522e3c2124f3510eef5cfd88420483248 (patch) | |
| tree | 2d3dbd342dccd34bc3545ae3ab7902042abe6815 /src/monitor/main.cpp | |
| parent | 296629e067563e82b4a08b2a785d1c2f13b5a285 (diff) | |
| download | tmwa-ec21450522e3c2124f3510eef5cfd88420483248.tar.gz tmwa-ec21450522e3c2124f3510eef5cfd88420483248.tar.bz2 tmwa-ec21450522e3c2124f3510eef5cfd88420483248.tar.xz tmwa-ec21450522e3c2124f3510eef5cfd88420483248.zip | |
Low hanging fruit
Diffstat (limited to 'src/monitor/main.cpp')
| -rw-r--r-- | src/monitor/main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/monitor/main.cpp b/src/monitor/main.cpp index f3db1b6..da03f60 100644 --- a/src/monitor/main.cpp +++ b/src/monitor/main.cpp @@ -129,7 +129,7 @@ bool read_config(ZString filename) static pid_t start_process(ZString exec) { - const char *args[2] = {exec.c_str(), NULL}; + const char *args[2] = {exec.c_str(), nullptr}; pid_t pid = fork(); if (pid == -1) { @@ -161,6 +161,7 @@ void stop_process(int sig) kill(pid_char, sig); #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wold-style-cast" +#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" signal(sig, SIG_DFL); #pragma GCC diagnostic pop raise(sig); @@ -236,7 +237,7 @@ int main(int argc, char *argv[]) FPRINTF(stderr, "[%s] forked map server: %lu\n"_fmt, timestamp, static_cast<unsigned long>(pid_map)); } - pid_t dead = wait(NULL); + pid_t dead = wait(nullptr); if (dead == -1) { perror("Failed to wait for child"); |