Changeset 10281
- Timestamp:
- 01/24/15 12:22:10 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-log.c
r10265 r10281 471 471 } 472 472 473 #define __init_log_prefix(fmt) \ 474 int32_t hdr_len = get_log_header(1, log_txt); \ 475 int32_t log_prefix_len = 0; \ 476 do { \ 477 if (log_prefix) { \ 478 char _lp[16]; \ 479 snprintf(_lp, sizeof(_lp), "(%s)", log_prefix); \ 480 log_prefix_len = snprintf(log_txt + hdr_len, sizeof(log_txt) - hdr_len, fmt, _lp); \ 481 } \ 482 } while(0) 483 473 484 #define __do_log() \ 474 485 do { \ 475 486 va_list params; \ 476 487 va_start(params, fmt); \ 477 int32_t hdr_len = get_log_header(1, log_txt); \ 478 int32_t log_prefix_len = 0; \ 479 if (log_prefix) { \ 480 char _lp[16]; \ 481 snprintf(_lp, sizeof(_lp), "(%s)", log_prefix); \ 482 log_prefix_len = snprintf(log_txt + hdr_len, sizeof(log_txt) - hdr_len, "%10s ", _lp); \ 483 } \ 488 __init_log_prefix("%10s "); \ 484 489 vsnprintf(log_txt + hdr_len + log_prefix_len, sizeof(log_txt) - (hdr_len + log_prefix_len), fmt, params); \ 485 490 va_end(params); \ … … 507 512 { 508 513 int32_t i; 509 int32_t hdr_len = get_log_header(0, log_txt);514 __init_log_prefix("%10s "); 510 515 for(i = 0; i < n; i += 16) 511 516 { 512 cs_hexdump(1, buf + i, (n - i > 16) ? 16 : n - i, log_txt + hdr_len , sizeof(log_txt) - hdr_len);517 cs_hexdump(1, buf + i, (n - i > 16) ? 16 : n - i, log_txt + hdr_len + log_prefix_len, sizeof(log_txt) - (hdr_len + log_prefix_len)); 513 518 write_to_log_int(log_txt, hdr_len); 514 519 }
Note:
See TracChangeset
for help on using the changeset viewer.