Changeset c337c62f for lib


Ignore:
Timestamp:
12/03/18 15:33:13 (2 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
develop
Children:
384e898
Parents:
e86a0c6
Message:

Fix bad git conflict that crept into ring: source code :/

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/format_linux_ring.c

    rd7d3267 rc337c62f  
    690690        if (packet->buffer == NULL)
    691691                return;
    692 <<<<<<< HEAD
    693         if (!libtrace) {
    694                 return;
    695         }
    696 =======
    697692        if (!packet->trace) {
    698693                fprintf(stderr, "Linux ring packet is not attached to a valid "
     
    700695                return;
    701696        }
    702 >>>>>>> fdf23b83dbe8088f53ec27af98ec6ed7b71cc34d
    703697
    704698        /* 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.