Changeset 1391 for trunk/lib/format_pcapfile.c

Timestamp:

12/03/08 13:24:55 (4 years ago)

Author:

perry

Message:

Rewrite the libtrace io subsystem to use the new wandio abstraction layer.

File:

• trunk/lib/format_pcapfile.c (modified) (10 diffs)

trunk/lib/format_pcapfile.c

@@ -58 +58 @@
 
 struct pcapfile_format_data_t {
-        libtrace_io_t *file;
+        io_t *file;
         struct {
                 int real_time;
@@ -66 +66 @@
 
 struct pcapfile_format_data_out_t {
-        libtrace_io_t *file;
+        iow_t *file;
         int level;
         int flag;
@@ -133 +133 @@
                         return -1;
 
-                err=libtrace_io_read(DATA(libtrace)->file,
+                err=wandio_read(DATA(libtrace)->file,
                                 &DATA(libtrace)->header,
                                 sizeof(DATA(libtrace)->header));
@@ -190 +190 @@
 {
         if (DATA(libtrace)->file)
-                libtrace_io_close(DATA(libtrace)->file);
+                wandio_destroy(DATA(libtrace)->file);
         free(libtrace->format_data);
         return 0; /* success */
@@ -198 +198 @@
 {
         if (DATA(libtrace)->file)
-                libtrace_io_close(DATA(libtrace)->file);
+                wandio_wdestroy(DATAOUT(libtrace)->file);
         free(libtrace->format_data);
         libtrace->format_data=NULL;
@@ -269 +269 @@
         flags |= TRACE_PREP_OWN_BUFFER;
         
-        err=libtrace_io_read(DATA(libtrace)->file,
+        err=wandio_read(DATA(libtrace)->file,
                         packet->buffer,
                         sizeof(libtrace_pcapfile_pkt_hdr_t));
@@ -284 +284 @@
         }
 
-        err=libtrace_io_read(DATA(libtrace)->file,
+        err=wandio_read(DATA(libtrace)->file,
                         (char*)packet->buffer+sizeof(libtrace_pcapfile_pkt_hdr_t),
                         (size_t)swapl(libtrace,((libtrace_pcapfile_pkt_hdr_t*)packet->buffer)->caplen)
@@ -362 +362 @@
                         libtrace_to_pcap_linktype(linktype);
 
-                libtrace_io_write(DATAOUT(out)->file, 
+                wandio_wwrite(DATAOUT(out)->file, 
                                 &pcaphdr, sizeof(pcaphdr));
         }
@@ -384 +384 @@
 
 
-        numbytes=libtrace_io_write(DATAOUT(out)->file,
+        numbytes=wandio_wwrite(DATAOUT(out)->file,
                         &hdr, sizeof(hdr));
 
@@ -390 +390 @@
                 return -1;
 
-        ret=libtrace_io_write(DATAOUT(out)->file,
+        ret=wandio_wwrite(DATAOUT(out)->file,
                         ptr,
                         remaining);