Changeset e0be8382


Ignore:
Timestamp:
03/24/15 13:19:04 (6 years ago)
Author:
Richard Sanger <rsangerarj@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
a330384
Parents:
773d5e2 (diff), 584d907 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'upstream_develop' into develop

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/trace.c

    r6b98325 re0be8382  
    205205        }
    206206       
    207         /* Oh well */
     207        /* No formats matched -- make sure we clean up the IO object we
     208         * used to probe the file magic */
     209        wandio_destroy(libtrace->io);
    208210        return;
    209211}
Note: See TracChangeset for help on using the changeset viewer.