Changeset c337c62f

Timestamp:

12/03/18 15:33:13 (23 months ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

384e898

Parents:

e86a0c6

Message:

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

File:

• lib/format_linux_ring.c (modified) (2 diffs)

lib/format_linux_ring.c

@@ -690 +690 @@
         if (packet->buffer == NULL)
                 return;
-<<<<<<< HEAD
-        if (!libtrace) {
-                return;
-        }
-=======
         if (!packet->trace) {
                 fprintf(stderr, "Linux ring packet is not attached to a valid "
@@ -700 +695 @@
                 return;
         }
->>>>>>> fdf23b83dbe8088f53ec27af98ec6ed7b71cc34d
 
         /* If we own the packet (i.e. it's not a copy), we need to free it */