diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-08 19:55:27 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-08 19:55:27 +0100 |
| commit | a10bc421fffbeaa872ae0cdcb651f0a7e613ee7f (patch) | |
| tree | 5d273aefa52561c53be2633268482fc45eb9bca6 | |
| parent | 6ce531106bc26c117da8e9700d489b462e41eb8f (diff) | |
| download | rsyslog-a10bc421fffbeaa872ae0cdcb651f0a7e613ee7f.tar.gz rsyslog-a10bc421fffbeaa872ae0cdcb651f0a7e613ee7f.tar.xz rsyslog-a10bc421fffbeaa872ae0cdcb651f0a7e613ee7f.zip | |
resolved compile problem, e.g. on FreeBSD
I commented out some debug code that is only useful in some
testing scenarios and re-enabled the old code. This solved a FreeBSD
compile issue. Also, I fixed some other syntax error, which somehow
went into the tree (I am still puzzled about that, especially as some
have already and successfully build from that tree... anyhow ;)).
| -rw-r--r-- | runtime/debug.c | 4 | ||||
| -rw-r--r-- | runtime/net.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/runtime/debug.c b/runtime/debug.c index 102d5d0f..53291fc2 100644 --- a/runtime/debug.c +++ b/runtime/debug.c @@ -819,8 +819,8 @@ dbgprint(obj_t *pObj, char *pszMsg, size_t lenMsg) if(altdbg != -1) write(altdbg, pszWriteBuf, lenWriteBuf); } - // old, reenable TODO lenWriteBuf = snprintf(pszWriteBuf, sizeof(pszWriteBuf), "%s: ", pszThrdName); - lenWriteBuf = snprintf(pszWriteBuf, sizeof(pszWriteBuf), "{%ld}%s: ", (long) syscall(SYS_gettid), pszThrdName); + lenWriteBuf = snprintf(pszWriteBuf, sizeof(pszWriteBuf), "%s: ", pszThrdName); + // use for testing: lenWriteBuf = snprintf(pszWriteBuf, sizeof(pszWriteBuf), "{%ld}%s: ", (long) syscall(SYS_gettid), pszThrdName); if(stddbg != -1) write(stddbg, pszWriteBuf, lenWriteBuf); if(altdbg != -1) write(altdbg, pszWriteBuf, lenWriteBuf); /* print object name header if we have an object */ diff --git a/runtime/net.c b/runtime/net.c index 30c923fe..6fa27658 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -1206,7 +1206,7 @@ rsRetVal cvthname(struct sockaddr_storage *f, uchar *pszHost, uchar *pszHostFQDN strcpy((char*)pszHost, (char*)pszHostFQDN); if( (glbl.GetPreserveFQDN() == 0) && (p = (uchar*) strchr((char*)pszHost, '.'))) { /* find start of domain name "machine.example.com" */ - strcmp((char*)(p + 1), (char*)glbl.GetLocalDomain())); + strcmp((char*)(p + 1), (char*)glbl.GetLocalDomain()); if(strcmp((char*)(p + 1), (char*)glbl.GetLocalDomain()) == 0) { *p = '\0'; /* simply terminate the string */ } else { |