diff -Naur kinit-5.0.0/src/kdeinit/kinit.cpp kinit-5.0.0.new/src/kdeinit/kinit.cpp --- kinit-5.0.0/src/kdeinit/kinit.cpp 2014-07-01 20:31:22.000000000 +0200 +++ kinit-5.0.0.new/src/kdeinit/kinit.cpp 2014-07-26 14:54:45.372904933 +0200 @@ -448,7 +448,7 @@ if (write(oom_pipe, &pid, sizeof(pid_t)) > 0) { sigsuspend(&oldsigs); // wait for the signal to come } else { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "Failed to reset OOM protection: %d\n", pid); #endif } @@ -512,7 +512,7 @@ } } } -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: preparing to launch '%s'\n", libpath.isEmpty() ? execpath.constData() : libpath.toUtf8().constData()); #endif @@ -742,7 +742,7 @@ d.n = read(d.fd[0], &d.result, 1); if (d.n == 1) { if (d.result == 2) { -#ifndef NDEBUG +#ifndef NODEBUG //fprintf(stderr, "kdeinit5: no kdeinit module, trying exec....\n"); #endif exec = true; @@ -1020,7 +1020,7 @@ sprintf(args + 5, "%d", d.launcher[1]); d.launcher_pid = launch(2, "klauncher", args); close(d.launcher[1]); -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Launched KLauncher, pid = %ld, result = %d\n", (long) d.launcher_pid, d.result); #endif @@ -1036,7 +1036,7 @@ } // KLauncher died... restart -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: KLauncher died unexpectedly.\n"); #endif // Make sure it's really dead. @@ -1055,7 +1055,7 @@ static bool handle_launcher_request(int sock, const char *who) { - (void)who; // for NDEBUG + (void)who; // for NODEBUG klauncher_header request_header; char *request_data = 0L; @@ -1098,7 +1098,7 @@ int avoid_loops = 0; const char *startup_id_str = "0"; // krazy:exclude=doublequote_chars -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Got %s '%s' from %s.\n", commandToString(request_header.cmd), name, who); @@ -1148,7 +1148,7 @@ } if ((arg_n - request_data) != request_header.arg_length) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: EXEC request has invalid format.\n"); #endif free(request_data); @@ -1208,13 +1208,13 @@ env_name = request_data; env_value = env_name + strlen(env_name) + 1; -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Got SETENV '%s=%s' from %s.\n", env_name, env_value, who); #endif if (request_header.arg_length != (int)(strlen(env_name) + strlen(env_value) + 2)) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: SETENV request has invalid format.\n"); #endif free(request_data); @@ -1222,14 +1222,14 @@ } qputenv(env_name, env_value); } else if (request_header.cmd == LAUNCHER_TERMINATE_KDE) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: terminate KDE.\n"); #endif #if HAVE_X11 kdeinit_xio_errhandler(0L); #endif } else if (request_header.cmd == LAUNCHER_TERMINATE_KDEINIT) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Got termination request (PID %ld).\n", (long) getpid()); #endif if (d.launcher_pid) { @@ -1242,14 +1242,14 @@ if (children) { close(d.wrapper); d.wrapper = -1; -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Closed sockets, but not exiting until all children terminate.\n"); #endif } else { raise(SIGTERM); } } else if (request_header.cmd == LAUNCHER_DEBUG_WAIT) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Debug wait activated.\n"); #endif d.debug_wait = true; @@ -1293,7 +1293,7 @@ do { exit_pid = waitpid(-1, &exit_status, WNOHANG); if (exit_pid > 0) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: PID %ld terminated.\n", (long) exit_pid); #endif if (waitForPid && (exit_pid == waitForPid)) { @@ -1308,7 +1308,7 @@ child_died(exit_pid, exit_status); if (d.wrapper < 0 && !children) { -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Last child terminated, exiting (PID %ld).\n", (long) getpid()); #endif @@ -1463,7 +1463,7 @@ int kdeinit_x_errhandler(Display *dpy, XErrorEvent *err) { -#ifndef NDEBUG +#ifndef NODEBUG char errstr[256]; // kdeinit almost doesn't use X, and therefore there shouldn't be any X error XGetErrorText(dpy, err->error_code, errstr, 256); @@ -1536,7 +1536,7 @@ 0, BlackPixelOfScreen(DefaultScreenOfDisplay(X11display)), BlackPixelOfScreen(DefaultScreenOfDisplay(X11display))); -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: opened connection to %s\n", DisplayString(X11display)); #endif int fd = XConnectionNumber(X11display); @@ -1595,7 +1595,7 @@ switch (x_fork_result) { case -1: -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "Mac OS X workaround fork() failed!\n"); #endif ::_exit(255); @@ -1766,7 +1766,7 @@ l.setLoadHints(QLibrary::ExportExternalSymbolsHint); (void)l.load(); } -#ifndef NDEBUG +#ifndef NODEBUG else { fprintf(stderr, "%s was not found.\n", extra_libs[i]); } @@ -1799,7 +1799,7 @@ qputenv("KDED_STARTED_BY_KDEINIT", "1"); pid = launch(1, KDED_EXENAME, 0); unsetenv("KDED_STARTED_BY_KDEINIT"); -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Launched KDED, pid = %ld result = %d\n", (long) pid, d.result); #endif d.kded_pid = pid; @@ -1810,7 +1810,7 @@ for (int i = 1; i < argc; i++) { if (safe_argv[i][0] == '+') { pid = launch(1, safe_argv[i] + 1, 0); -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Launched '%s', pid = %ld result = %d\n", safe_argv[i] + 1, (long) pid, d.result); #endif handle_requests(pid); @@ -1822,7 +1822,7 @@ // Ignore } else { pid = launch(1, safe_argv[i], 0); -#ifndef NDEBUG +#ifndef NODEBUG fprintf(stderr, "kdeinit5: Launched '%s', pid = %ld result = %d\n", safe_argv[i], (long) pid, d.result); #endif } diff -Naur kinit-5.0.0/src/klauncher/klauncher.cpp kinit-5.0.0.new/src/klauncher/klauncher.cpp --- kinit-5.0.0/src/klauncher/klauncher.cpp 2014-07-01 20:31:22.000000000 +0200 +++ kinit-5.0.0.new/src/klauncher/klauncher.cpp 2014-07-26 14:51:53.553052977 +0200 @@ -65,7 +65,7 @@ // Dispose slaves after being idle for SLAVE_MAX_IDLE seconds #define SLAVE_MAX_IDLE 30 -// #define KLAUNCHER_VERBOSE_OUTPUT +#define KLAUNCHER_VERBOSE_OUTPUT static const char *const s_DBusStartupTypeToString[] = { "DBusNone", "DBusUnique", "DBusMulti", "ERROR" };