Changeset c66068d for lib/format_legacy.c

Timestamp:

12/03/08 13:24:55 (13 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:

f66a2dca

Parents:

7157db8

Message:

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

File:

• lib/format_legacy.c (modified) (5 diffs)

lib/format_legacy.c

@@ -35 +35 @@
 #include "libtrace_int.h"
 #include "format_helper.h"
+#include "wandio.h"
 
 #include <sys/stat.h>
@@ -66 +67 @@
         union {
                 int fd;
-                libtrace_io_t *file;
+                io_t *file;
         } input;
         time_t starttime;       /* Used for legacy_nzix */
@@ -175 +176 @@
 
 static int erf_fin_input(libtrace_t *libtrace) {
-        libtrace_io_close(INPUT.file);
+        wandio_destroy(INPUT.file);
         free(libtrace->format_data);
         return 0;
@@ -237 +238 @@
         while (1) {
         
-                if ((numbytes=libtrace_io_read(INPUT.file,
+                if ((numbytes=wandio_read(INPUT.file,
                                                 buffer,
                                                 (size_t)64)) != 64) {
@@ -279 +280 @@
         
         while (1) {
-                if ((numbytes = libtrace_io_read(INPUT.file, buffer,
+                if ((numbytes = wandio_read(INPUT.file, buffer,
                                                 (size_t)68)) != 68) {
                         if (numbytes < 0) {