X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=trace.c;h=0d6c114a0182b33ba50bc5e7906a7c7ed2c942fd;hp=a810d8cb7f1379868498fdd87191c3280894dfa7;hb=79bd731c0db3e3202cfeed2af3fb217ae744b70f;hpb=ebf395421f6c490803afdcdbc2332d965b942f53 diff --git a/trace.c b/trace.c index a810d8c..0d6c114 100644 --- a/trace.c +++ b/trace.c @@ -92,7 +92,9 @@ static char *print_trace(int detail, int port, char *interface, char *caller, ch char buffer[256]; time_t ti = trace.sec; struct tm *tm; +#ifdef WITH_MISDN struct mISDNport *mISDNport; +#endif int i; trace_string[0] = '\0'; // always clear string @@ -115,6 +117,7 @@ static char *print_trace(int detail, int port, char *interface, char *caller, ch /* head */ if (detail >= 3) { SCAT(trace_string, "------------------------------------------------------------------------------\n"); +#ifdef WITH_MISDN /* "Port: 1 (BRI PTMP TE)" */ if (trace.port >= 0) { mISDNport = mISDNport_first; @@ -132,6 +135,7 @@ static char *print_trace(int detail, int port, char *interface, char *caller, ch SPRINT(buffer, "Port: %d (does not exist)\n", trace.port); SCAT(trace_string, buffer); } else +#endif SCAT(trace_string, "Port: ---"); if (trace.interface[0]) { @@ -198,6 +202,10 @@ static char *print_trace(int detail, int port, char *interface, char *caller, ch /* elements */ switch(detail) { case 1: /* brief */ + if (trace.interface[0]) { + SPRINT(buffer, " iface %s", trace.interface); + SCAT(trace_string, buffer); + } if (trace.port >= 0) { SPRINT(buffer, " port %d", trace.port); SCAT(trace_string, buffer); @@ -264,7 +272,7 @@ void _end_trace(const char *__file, int __line) FILE *fp; struct admin_list *admin; struct admin_queue *response, **responsep; /* response pointer */ - int ret; + int __attribute__((__unused__)) ret; if (!trace.name[0]) PERROR("trace not started in file %s line %d\n", __file, __line); @@ -274,7 +282,7 @@ void _end_trace(const char *__file, int __line) if (string) { /* process debug */ if (options.deb) - debug(NULL, 0, "TRACE", string); + debug(NULL, NULL, 0, "TRACE", string); /* process log */ if (options.log[0]) { fp = fopen(options.log, "a");