diff --git a/src/klogd.c b/src/klogd.c index 913d3d5..6defff1 100644 --- a/src/klogd.c +++ b/src/klogd.c @@ -788,22 +788,20 @@ int main(int argc, char *argv[]) Terminate(); } - /* Determine where kernel logging information is to come from. */ #if defined(KLOGD_DELAY) sleep(KLOGD_DELAY); #endif + + /* Determine where kernel logging information is to come from. */ logsrc = GetKernelLogSrc(); if (symbol_lookup) { InitKsyms(symfile); InitMsyms(); } -#ifndef TESTING if (getpid() != ppid) kill(ppid, SIGTERM); -#endif - /* The main loop. */ while (1) { if (change_state) ChangeLogging(); diff --git a/src/ksym.c b/src/ksym.c index b818ee0..a80250c 100644 --- a/src/ksym.c +++ b/src/ksym.c @@ -284,10 +284,8 @@ static int CheckVersion(char *version) int major; int minor; int patch; -#ifndef TESTING struct utsname utsname; int kvnum; -#endif /* Early return if there is no hope. */ if (strncmp(version, prefix, strlen(prefix)) == 0 /* ELF */ || @@ -315,7 +313,6 @@ static int CheckVersion(char *version) patch); sprintf(vstring, "%d.%d.%d", major, minor, patch); -#ifndef TESTING /* * We should now have the version string in the vstring variable in * the same format that it is stored in by the kernel. We now @@ -344,8 +341,7 @@ static int CheckVersion(char *version) if (vnum != kvnum) return -1; - /* Success. */ -#endif + /* Success. */ return 1; }