diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-04 09:30:47 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-04 09:30:47 +0200 |
| commit | af968e6ef9f146987a858743df3d9f64d3bb0661 (patch) | |
| tree | aa3500dc668d50edfbbc76ad3f64c5d0e533ce85 | |
| parent | fe8ac119f75bc6d2763896b8e1a85ecfeb41bffb (diff) | |
| download | rsyslog-af968e6ef9f146987a858743df3d9f64d3bb0661.tar.gz rsyslog-af968e6ef9f146987a858743df3d9f64d3bb0661.tar.xz rsyslog-af968e6ef9f146987a858743df3d9f64d3bb0661.zip | |
cleanup: removing no longer needed macros
| -rw-r--r-- | runtime/srUtils.h | 13 | ||||
| -rw-r--r-- | tools/syslogd.c | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/runtime/srUtils.h b/runtime/srUtils.h index 76d25eb2..3169fd94 100644 --- a/runtime/srUtils.h +++ b/runtime/srUtils.h @@ -93,19 +93,6 @@ int getSubString(uchar **ppSrc, char *pDst, size_t DstSize, char cSep); rsRetVal getFileSize(uchar *pszName, off_t *pSize); /* mutex operations */ -/* some macros to cancel-safe lock a mutex (it will automatically be released - * when the thread is cancelled. This needs to be done as macros because - * pthread_cleanup_push sometimes is a macro that can not be used inside a function. - * It's a bit ugly, but works well... rgerhards, 2008-01-20 - */ -#define DEFVARS_mutex_cancelsafeLock int iCancelStateSave -#define mutex_cancelsafe_lock(mut) \ - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave); \ - d_pthread_mutex_lock(mut); \ - pthread_cleanup_push(mutexCancelCleanup, mut); \ - pthread_setcancelstate(iCancelStateSave, NULL); -#define mutex_cancelsafe_unlock(mut) pthread_cleanup_pop(1) - /* some useful constants */ #define DEFVARS_mutexProtection\ int bLockedOpIsLocked=0 diff --git a/tools/syslogd.c b/tools/syslogd.c index 93f37e4a..98f06627 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2406,7 +2406,7 @@ queryLocalHostname(void) } /* LocalDomain is "" or part of LocalHostName, allocate a new string */ - CHKmalloc(LocalDomain = (uchar*)strdup(LocalDomain)); + CHKmalloc(LocalDomain = (uchar*)strdup((char*)LocalDomain)); /* Convert to lower case to recognize the correct domain laterly */ for(p = LocalDomain ; *p ; p++) |