Changeset c337c62f
- Timestamp:
- 12/03/18 15:33:13 (2 years ago)
- Branches:
- develop
- Children:
- 384e898
- Parents:
- e86a0c6
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_linux_ring.c
rd7d3267 rc337c62f 690 690 if (packet->buffer == NULL) 691 691 return; 692 <<<<<<< HEAD693 if (!libtrace) {694 return;695 }696 =======697 692 if (!packet->trace) { 698 693 fprintf(stderr, "Linux ring packet is not attached to a valid " … … 700 695 return; 701 696 } 702 >>>>>>> fdf23b83dbe8088f53ec27af98ec6ed7b71cc34d703 697 704 698 /* If we own the packet (i.e. it's not a copy), we need to free it */
Note: See TracChangeset
for help on using the changeset viewer.