Changeset c0cd256


Ignore:
Timestamp:
08/21/06 21:07:27 (14 years ago)
Author:
Perry Lorier <perry@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, 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:
c28b5c7
Parents:
94af885
Message:

Remove old CONSTRUCTOR initialisation code, and only rely on the newer
trace_init() function.

Location:
lib
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • lib/format_duck.c

    r575c531 rc0cd256  
    155155                /* Read in the duck version from the start of the trace */
    156156                if ((numbytes = libtrace_io_read(INPUT->file, &version,
    157                                         sizeof(uint32_t))) == -1) {
     157                                        sizeof(version))) == sizeof(uint32_t)) {
    158158                        trace_set_err(libtrace, errno,
    159159                                        "Reading DUCK version failed");
     
    163163                        return 0;
    164164                }
    165                 INPUT->dag_version = version;
     165                INPUT->dag_version = bswap_le_to_host32(version);
    166166        }
    167167       
     
    218218        /* Writing the DUCK version will help with reading it back in later! */
    219219                if ((numbytes = libtrace_io_write(OUTPUT->file, &packet->type,
    220                                         sizeof(uint32_t))) != sizeof(uint32_t)){
     220                                sizeof(packet->type))) != sizeof(uint32_t)){
    221221                        trace_set_err_out(libtrace, errno,
    222222                                        "Writing DUCK version failed");
     
    301301};
    302302
    303 void CONSTRUCTOR duck_constructor() {
     303void duck_constructor() {
    304304        register_format(&duck);
    305305}       
  • lib/format_erf.c

    r4abd50b rc0cd256  
    12251225};
    12261226
    1227 void CONSTRUCTOR erf_constructor() {
     1227void erf_constructor() {
    12281228        register_format(&rtclient);
    12291229        register_format(&erf);
  • lib/format_legacy.c

    re5c2bc4 rc0cd256  
    324324
    325325       
    326 void CONSTRUCTOR legacy_constructor() {
     326void legacy_constructor() {
    327327        register_format(&legacypos);
    328328        register_format(&legacyeth);
  • lib/format_linux.c

    rcd7eec7 rc0cd256  
    354354};
    355355
    356 void CONSTRUCTOR linuxnative_constructor() {
     356void linuxnative_constructor() {
    357357        register_format(&linuxnative);
    358358}
  • lib/format_pcap.c

    re5c2bc4 rc0cd256  
    602602};
    603603
    604 void CONSTRUCTOR pcap_constructor() {
     604void pcap_constructor() {
    605605        register_format(&pcap);
    606606        register_format(&pcapint);
  • lib/format_pcapfile.c

    rd3fd4d3 rc0cd256  
    387387
    388388
    389 void CONSTRUCTOR pcapfile_constructor() {
     389void pcapfile_constructor() {
    390390        register_format(&pcapfile);
    391391}
  • lib/format_rt.c

    r362c5f2 rc0cd256  
    700700};
    701701
    702 void CONSTRUCTOR rt_constructor() {
     702void rt_constructor() {
    703703        register_format(&rt);
    704704}
  • lib/format_wag.c

    r4abd50b rc0cd256  
    631631
    632632
    633 void CONSTRUCTOR wag_constructor() {
     633void wag_constructor() {
    634634        register_format(&wag);
    635635        register_format(&wag_trace);
  • lib/libtrace.h.in

    rbdca481 rc0cd256  
    140140#  define UNUSED __attribute__((unused))
    141141#  define PACKED __attribute__((packed))
    142 #  define CONSTRUCTOR __attribute__((constructor))
    143142#else
    144143#  define SIMPLE_FUNCTION
    145144#  define UNUSED
    146145#  define PACKED
    147 #  define CONSTRUCTOR
    148146#endif
    149147       
Note: See TracChangeset for help on using the changeset viewer.