Changeset f3ed52a


Ignore:
Timestamp:
11/23/05 12:38:56 (16 years ago)
Author:
Daniel Lawson <dlawson@…>
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:
6342c18
Parents:
08f7fca
Message:

working with trace_event on pcapint
changed some decls inside the format_*.c functions - s/extern/static/

Location:
lib
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • lib/format_erf.c

    r08f7fca rf3ed52a  
    6363#include <stdlib.h>
    6464
     65/*
     66 gzread (gzFile, buf, len)
     67 gzwrite(gzFile, buf, len)
     68 gzdopen(path, mode)
     69 gzclose(gzFile)
     70
     71 fread(ptr, size, num, FILE)
     72 fwrite(ptr, size, num, FILE)
     73 fopen(path, mode)
     74 fdopen(fildes, mode)
     75*/
    6576#if HAVE_ZLIB
    6677#  include <zlib.h>
    6778#  define LIBTRACE_READ gzread
     79#  define LIBTRACE_OPEN gzopen
    6880#  define LIBTRACE_FDOPEN gzdopen
    6981#  define LIBTRACE_CLOSE gzclose
    7082#  define LIBTRACE_WRITE gzwrite
    7183#else
    72 #  define LIBTRACE_READ read
    73 #  define LIBTRACE_FDOPEN open
    74 #  define LIBTRACE_CLOSE close
    75 #  define LIBTRACE_WRITE write
     84#  define LIBTRACE_READ fread
     85#  define LIBTRACE_OPEN fopen
     86#  define LIBTRACE_FDOPEN fdopen
     87#  define LIBTRACE_CLOSE fclose
     88#  define LIBTRACE_WRITE fwrite
    7689#endif
    7790
     
    8396#endif
    8497
    85 extern struct libtrace_format_t erf;
    86 extern struct libtrace_format_t rtclient;
     98static struct libtrace_format_t erf;
     99static struct libtrace_format_t rtclient;
    87100#if HAVE_DAG
    88 extern struct libtrace_format_t dag;
     101static struct libtrace_format_t dag;
    89102#endif
    90 extern struct libtrace_format_t legacypos;
    91 extern struct libtrace_format_t legacyeth;
    92 extern struct libtrace_format_t legacyatm;
     103static struct libtrace_format_t legacypos;
     104static struct libtrace_format_t legacyeth;
     105static struct libtrace_format_t legacyatm;
    93106
    94107#define CONNINFO libtrace->format_data->conn_info
     
    113126                gzFile *file;
    114127#else   
    115                 FILE *file;
     128                FILE  *file;
    116129#endif
    117130        } input;
  • lib/format_pcap.c

    r41b53c2 rf3ed52a  
    6565
    6666#if HAVE_PCAP
    67 extern struct libtrace_format_t pcap;
    68 extern struct libtrace_format_t pcapint;
     67static struct libtrace_format_t pcap;
     68static struct libtrace_format_t pcapint;
    6969
    7070
     
    468468        pcap_set_capture_length,        /* set_capture_length */
    469469        pcap_get_fd,                    /* get_fd */
    470         trace_event_device,             /* trace_event */
     470        trace_event_trace,              /* trace_event */
    471471        pcapint_help                    /* help */
    472472};
  • lib/format_template.c

    r7c8eacf rf3ed52a  
    4141#endif
    4242
    43 extern struct libtrace_format_t template;
     43static struct libtrace_format_t template;
    4444
    4545struct libtrace_format_data_t {
  • lib/format_wag.c

    r8013711 rf3ed52a  
    8888#endif
    8989
    90 extern struct libtrace_format_t wag;
     90static struct libtrace_format_t wag;
    9191
    9292#define CONNINFO libtrace->format_data->conn_info
  • lib/trace.c

    rf04e489 rf3ed52a  
    10951095struct libtrace_eventobj_t trace_event(struct libtrace_t *trace,
    10961096                struct libtrace_packet_t *packet) {
    1097         struct libtrace_eventobj_t event;
     1097        struct libtrace_eventobj_t event = {0,0,0.0,0};
    10981098
    10991099        if (!trace) {
Note: See TracChangeset for help on using the changeset viewer.