emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove last remnants of TESTING define

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson 2019-11-03 17:28:47 +01:00
parent ab621e189b
commit ea565153bc
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/klogd.c
View File

@ -788,22 +788,20 @@ int main(int argc, char *argv[])
Terminate(); Terminate();
} }
/* Determine where kernel logging information is to come from. */
#if defined(KLOGD_DELAY) #if defined(KLOGD_DELAY)
sleep(KLOGD_DELAY); sleep(KLOGD_DELAY);
#endif #endif
/* Determine where kernel logging information is to come from. */
logsrc = GetKernelLogSrc(); logsrc = GetKernelLogSrc();
if (symbol_lookup) { if (symbol_lookup) {
InitKsyms(symfile); InitKsyms(symfile);
InitMsyms(); InitMsyms();
} }
#ifndef TESTING
if (getpid() != ppid) if (getpid() != ppid)
kill(ppid, SIGTERM); kill(ppid, SIGTERM);
#endif
/* The main loop. */
while (1) { while (1) {
if (change_state) if (change_state)
ChangeLogging(); ChangeLogging();

6
src/ksym.c
View File

@ -284,10 +284,8 @@ static int CheckVersion(char *version)
int major; int major;
int minor; int minor;
int patch; int patch;
#ifndef TESTING
struct utsname utsname; struct utsname utsname;
int kvnum; int kvnum;
#endif
/* Early return if there is no hope. */ /* Early return if there is no hope. */
if (strncmp(version, prefix, strlen(prefix)) == 0 /* ELF */ || if (strncmp(version, prefix, strlen(prefix)) == 0 /* ELF */ ||
@ -315,7 +313,6 @@ static int CheckVersion(char *version)
patch); patch);
sprintf(vstring, "%d.%d.%d", major, minor, patch); sprintf(vstring, "%d.%d.%d", major, minor, patch);
#ifndef TESTING
/* /*
* We should now have the version string in the vstring variable in * 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 * 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) if (vnum != kvnum)
return -1; return -1;
/* Success. */ /* Success. */
#endif
return 1; return 1;
} }