X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fevent_client.h;fp=citadel%2Fevent_client.h;h=2b5b698bd5b936f5572a57c977f0322968ffe521;hb=0c9cb3fbc797de34635bc6748937b710a4d37bcb;hp=66976a8aded74ce1fc8aa1a120976007579c26ca;hpb=aaffd92765c6a7fa51e97e44693a648a6328e4f5;p=citadel.git diff --git a/citadel/event_client.h b/citadel/event_client.h index 66976a8ad..2b5b698bd 100644 --- a/citadel/event_client.h +++ b/citadel/event_client.h @@ -232,24 +232,6 @@ extern int DebugCAres; #define CCID ((CitContext*)IO->CitContext)?((CitContext*)IO->CitContext)->cs_pid:-1 -#define EVQ_syslog(LEVEL, FORMAT, ...) \ - EDBGLOG (LEVEL) syslog(LEVEL, "%sQ " FORMAT, IOSTR, __VA_ARGS__) - -#define EVQM_syslog(LEVEL, FORMAT) \ - EDBGLOG (LEVEL) syslog(LEVEL, "%s " FORMAT, IOSTR) - -#define EV_syslog(LEVEL, FORMAT, ...) \ - EDBGLOG (LEVEL) syslog(LEVEL, "%s[%ld]CC[%d] " FORMAT, IOSTR, IO->ID, CCID, __VA_ARGS__) - -#define EVM_syslog(LEVEL, FORMAT) \ - EDBGLOG (LEVEL) syslog(LEVEL, "%s[%ld]CC[%d] " FORMAT, IOSTR, IO->ID, CCID) - -#define EVNC_syslog(LEVEL, FORMAT, ...) \ - EDBGLOG (LEVEL) syslog(LEVEL, "%s[%ld] " FORMAT, IOSTR, IO->ID, __VA_ARGS__) - -#define EVNCM_syslog(LEVEL, FORMAT) EDBGLOG (LEVEL) syslog(LEVEL, "%s[%ld]" FORMAT, IOSTR, IO->ID) - - #define CDBGLOG() if (DebugCAres != 0) #define CEDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugCAres != 0)) #define EV_DNS_LOG_START(a) \ @@ -276,12 +258,6 @@ extern int DebugCAres; CDBGLOG () { syslog(LOG_DEBUG, "%s[%ld]CC[%d] * Init " #a " %p", IOSTR, IO->ID, CCID, &IO->a); \ EV_backtrace(IO);} -#define EV_DNS_syslog(LEVEL, FORMAT, ...) \ - CEDBGLOG (LEVEL) syslog(LEVEL, "%s[%ld]CC[%d] " FORMAT, IOSTR, IO->ID, CCID, __VA_ARGS__) - -#define EVM_DNS_syslog(LEVEL, FORMAT) \ - CEDBGLOG (LEVEL) syslog(LEVEL, "%s[%ld]CC[%d] " FORMAT, IOSTR, IO->ID, CCID) - void FreeAsyncIOContents(AsyncIO *IO); eNextState NextDBOperation(AsyncIO *IO, IO_CallBack CB); @@ -322,7 +298,7 @@ void SetNextTimeout(AsyncIO *IO, double timeout); do { \ sta = curl_easy_setopt(chnd, (CURLOPT_##s), (v)); \ if (sta) { \ - EVQ_syslog(LOG_ERR, \ + syslog(LOG_ERR, \ "error setting option " #s \ " on curl handle: %s", \ curl_easy_strerror(sta)); \