Changeset 516

Timestamp:

11/24/05 14:28:08 (7 years ago)

Author:

dlawson

Message:

wrapped stdin and stdout in fileno() when passing to LIBTRACE_FDOPEN

Location:

trunk/lib

Files:

• format_erf.c (modified) (2 diffs)
• format_wag.c (modified) (3 diffs)

trunk/lib/format_erf.c

@@ -269 +269 @@
                 // STDIN
                 libtrace->sourcetype = STDIN;
-                if ((INPUT.file = LIBTRACE_FDOPEN(stdin, "r")) < 0) {
+                if ((INPUT.file = LIBTRACE_FDOPEN(fileno(stdin), "r")) < 0) {
                         perror("libtrace_fdopen:");
                         return 0;
@@ -382 +382 @@
         if (!strncmp(libtrace->uridata,"-",1)) {
                 // STDOUT
-                OUTPUT.file = LIBTRACE_FDOPEN(stdout,filemode);
+                OUTPUT.file = LIBTRACE_FDOPEN(fileno(stdout),filemode);
         }
         else {

trunk/lib/format_wag.c

@@ -30 +30 @@
 
 #define _GNU_SOURCE
+#include "config.h"
+#include "common.h"
 #include "libtrace.h"
 #include "libtrace_int.h"
 #include "format_helper.h"
 #include "wag.h"
-#include "config.h"
 
 #ifdef HAVE_INTTYPES_H
@@ -63 +64 @@
 #include <stdlib.h>
 
-/*
-#if HAVE_ZLIB
-#  include <zlib.h>
-#  define LIBTRACE_READ gzread
-#  define LIBTRACE_FDOPEN gzdopen
-#  define LIBTRACE_CLOSE gzclose
-#  define LIBTRACE_WRITE gzwrite
-#else
-#  define LIBTRACE_READ read
-#  define LIBTRACE_FDOPEN open
-#  define LIBTRACE_CLOSE close
-#  define LIBTRACE_WRITE write
-#endif
-*/
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>
@@ -146 +133 @@
                 // STDIN
                 libtrace->sourcetype = STDIN;
-                INPUT.file = LIBTRACE_FDOPEN(STDIN,"r");
+                INPUT.file = LIBTRACE_FDOPEN(fileno(stdin),"r");
 
         } else {