[svn:parrot] r18998 - trunk/src/io

[petdance]

Author: petdance
Date: Thu Jun 14 09:18:07 2007
New Revision: 18998

Modified:
   trunk/src/io/io.c
   trunk/src/io/io_private.h
   trunk/src/io/io_unix.c

Log:
renamed the macros PIO_STD{IN,OUT,ERR} to _PIO_STD{IN,OUT,ERR}, so they do not 
conflict with the functions of the same name

Modified: trunk/src/io/io.c
==============================================================================
--- trunk/src/io/io.c   (original)
+++ trunk/src/io/io.c   Thu Jun 14 09:18:07 2007
@@ -261,14 +261,14 @@
          * see also #36677
          *
          */
-        if (!PIO_STDIN(interp)) {
-            PIO_STDIN(interp) = pmc_new(interp, enum_class_Undef);
+        if (!_PIO_STDIN(interp)) {
+            _PIO_STDIN(interp) = pmc_new(interp, enum_class_Undef);
         }
-        if (!PIO_STDOUT(interp)) {
-            PIO_STDOUT(interp) = pmc_new(interp, enum_class_Undef);
+        if (!_PIO_STDOUT(interp)) {
+            _PIO_STDOUT(interp) = pmc_new(interp, enum_class_Undef);
         }
-        if (!PIO_STDERR(interp)) {
-            PIO_STDERR(interp) = pmc_new(interp, enum_class_Undef);
+        if (!_PIO_STDERR(interp)) {
+            _PIO_STDERR(interp) = pmc_new(interp, enum_class_Undef);
         }
 
         if (Interp_debug_TEST(interp, PARROT_START_DEBUG_FLAG)) {
@@ -1018,7 +1018,7 @@
 
     if (interp) {
         STRING * const str = Parrot_vsprintf_c(interp, s, args);
-        ret=PIO_putps(interp, PIO_STDOUT(interp), str);
+        ret=PIO_putps(interp, _PIO_STDOUT(interp), str);
     }
     else {
         /* Be nice about this...
@@ -1052,7 +1052,7 @@
     if (interp) {
         STRING * const str = Parrot_vsprintf_c(interp, s, args);
 
-        ret=PIO_putps(interp, PIO_STDERR(interp), str);
+        ret=PIO_putps(interp, _PIO_STDERR(interp), str);
     }
     else {
         /* Be nice about this...
@@ -1094,13 +1094,8 @@
 
 =head2 C<PIO_STD*> Functions
 
-The C<PIO_STD*> functions are defined using the C<Interp *interp> macro. The
-prototype is protected with an identity macro.
-
 */
 
-#define ID(a) a
-
 /*
 
 FUNCDOC: PIO_STDIN
@@ -1111,9 +1106,9 @@
 
 PARROT_API
 PMC *
-PIO_STDIN ID((Interp *interp))
+PIO_STDIN(Interp *interp /*NN*/)
 {
-    return PIO_STDIN(interp);
+    return _PIO_STDIN(interp);
 }
 
 /*
@@ -1126,9 +1121,9 @@
 
 PARROT_API
 PMC *
-PIO_STDOUT ID((Interp *interp))
+PIO_STDOUT(Interp *interp /*NN*/)
 {
-    return PIO_STDOUT(interp);
+    return _PIO_STDOUT(interp);
 }
 
 /*
@@ -1141,9 +1136,9 @@
 
 PARROT_API
 PMC *
-PIO_STDERR ID((Interp *interp))
+PIO_STDERR(Interp *interp)
 {
-    return PIO_STDERR(interp);
+    return _PIO_STDERR(interp);
 }
 
 /*

Modified: trunk/src/io/io_private.h
==============================================================================
--- trunk/src/io/io_private.h   (original)
+++ trunk/src/io/io_private.h   Thu Jun 14 09:18:07 2007
@@ -131,9 +131,9 @@
 extern STRING * PIO_make_io_string(Interp *interp, STRING **buf, size_t);
 
 /* redefine PIO_STD* for internal use */
-#define PIO_STDIN(i)   (((ParrotIOData*)i->piodata)->table[PIO_STDIN_FILENO])
-#define PIO_STDOUT(i)  (((ParrotIOData*)i->piodata)->table[PIO_STDOUT_FILENO])
-#define PIO_STDERR(i)  (((ParrotIOData*)i->piodata)->table[PIO_STDERR_FILENO])
+#define _PIO_STDIN(i)   (((ParrotIOData*)i->piodata)->table[PIO_STDIN_FILENO])
+#define _PIO_STDOUT(i)  (((ParrotIOData*)i->piodata)->table[PIO_STDOUT_FILENO])
+#define _PIO_STDERR(i)  (((ParrotIOData*)i->piodata)->table[PIO_STDERR_FILENO])
 
 /*
  * These function walk down the layerstack starting at l

Modified: trunk/src/io/io_unix.c
==============================================================================
--- trunk/src/io/io_unix.c      (original)
+++ trunk/src/io/io_unix.c      Thu Jun 14 09:18:07 2007
@@ -121,21 +121,21 @@
 static INTVAL
 PIO_unix_init(Interp *interp, ParrotIOLayer *layer)
 {
-    ParrotIOData *d = interp->piodata;
+    ParrotIOData * const d = interp->piodata;
     if (d != NULL && d->table != NULL) {
         ParrotIO *io;
 
         io = PIO_unix_fdopen(interp, layer, STDIN_FILENO, PIO_F_READ);
         if (!io) return -1;
-        PIO_STDIN(interp) = new_io_pmc(interp, io);
+        _PIO_STDIN(interp) = new_io_pmc(interp, io);
 
         io = PIO_unix_fdopen(interp, layer, STDOUT_FILENO, PIO_F_WRITE);
         if (!io) return -1;
-        PIO_STDOUT(interp) = new_io_pmc(interp, io);
+        _PIO_STDOUT(interp) = new_io_pmc(interp, io);
 
         io = PIO_unix_fdopen(interp, layer, STDERR_FILENO, PIO_F_WRITE);
         if (!io) return -1;
-        PIO_STDERR(interp) = new_io_pmc(interp, io);
+        _PIO_STDERR(interp) = new_io_pmc(interp, io);
 
         return 0;
     }