X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=trace.c;h=2050a2ddc137fe6abd9b402faa95bb0c39d16c5f;hp=63ffb16586c6a3e383f761c20b604f4e02023636;hb=57549529c86785b7ecf5f56d2a3ff42b5e519755;hpb=08aad9a8c5ad279759e0a870b1dd0d8159ce3444 diff --git a/trace.c b/trace.c index 63ffb16..2050a2d 100644 --- a/trace.c +++ b/trace.c @@ -14,19 +14,7 @@ struct trace trace; char trace_string[MAX_TRACE_ELEMENTS * 100 + 400]; -static const char *spaces[11] = { - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - "", -}; +static const char *spaces = " "; /* * initializes a new trace @@ -112,7 +100,7 @@ static char *print_trace(int detail, int port, char *interface, char *caller, ch return(NULL); /* filter trace */ - if (port && trace.port) + if (port >= 0 && trace.port >= 0) if (port != trace.port) return(NULL); if (interface) if (interface[0] && trace.interface[0]) if (!!strcasecmp(interface, trace.interface)) return(NULL); @@ -128,7 +116,7 @@ static char *print_trace(int detail, int port, char *interface, char *caller, ch { SCAT(trace_string, "------------------------------------------------------------------------------\n"); /* "Port: 1 (BRI PTMP TE)" */ - if (trace.port) + if (trace.port >= 0) { mISDNport = mISDNport_first; while(mISDNport) @@ -219,7 +207,7 @@ static char *print_trace(int detail, int port, char *interface, char *caller, ch switch(detail) { case 1: /* brief */ - if (trace.port) + if (trace.port >= 0) { SPRINT(buffer, " port %d", trace.port); SCAT(trace_string, buffer); @@ -252,12 +240,12 @@ static char *print_trace(int detail, int port, char *interface, char *caller, ch i = 0; while(i < trace.elements) { - SPRINT(buffer, " %s%s", trace.element[i].name, spaces[strlen(trace.element[i].name)]); + SPRINT(buffer, " %s%s", trace.element[i].name, &spaces[strlen(trace.element[i].name)]); if (i) if (!strcmp(trace.element[i].name, trace.element[i-1].name)) SPRINT(buffer, " "); SCAT(trace_string, buffer); if (trace.element[i].sub[0]) - SPRINT(buffer, " : %s%s = ", trace.element[i].sub, spaces[strlen(trace.element[i].sub)]); + SPRINT(buffer, " : %s%s = ", trace.element[i].sub, &spaces[strlen(trace.element[i].sub)]); else SPRINT(buffer, " : "); SCAT(trace_string, buffer); @@ -294,7 +282,7 @@ void _end_trace(const char *__file, int __line) if (options.deb || options.log[0]) { - string = print_trace(1, 0, NULL, NULL, NULL, 0); + string = print_trace(1, -1, NULL, NULL, NULL, 0); if (string) { /* process debug */