[svn:parrot] r36716 - in trunk: docs/pdds/draft include/parrot src src/packfile

[Infinoid at svn.parrot.org]

Author: Infinoid
Date: Sat Feb 14 07:12:45 2009
New Revision: 36716
URL: https://trac.parrot.org/parrot/changeset/36716

Log:
[cage] Fix codetest failures.

Modified:
   trunk/docs/pdds/draft/pdd10_embedding.pod
   trunk/include/parrot/packfile.h
   trunk/src/byteorder.c
   trunk/src/packfile.c
   trunk/src/packfile/pf_items.c

Modified: trunk/docs/pdds/draft/pdd10_embedding.pod
==============================================================================
--- trunk/docs/pdds/draft/pdd10_embedding.pod	Sat Feb 14 06:04:04 2009	(r36715)
+++ trunk/docs/pdds/draft/pdd10_embedding.pod	Sat Feb 14 07:12:45 2009	(r36716)
@@ -208,9 +208,9 @@
 I<Note: I suppose NULL would work as well; it might be more C-like.  Continue
 considering.>
 
-I<Note also: the current C<Parrot_pbc_read()> and C<Parrot_pbc_load()> exposes the
-details of packfiles to the external API and uses two operations to perform a
-single logical operation.>
+I<Note also: the current C<Parrot_pbc_read()> and C<Parrot_pbc_load()> exposes
+the details of packfiles to the external API and uses two operations to
+perform a single logical operation.>
 
 I<Note: it may be worth reconsidering these names, if
 C<Parrot_load_bytecode()> can load PBC, PIR, and PASM files without having a

Modified: trunk/include/parrot/packfile.h
==============================================================================
--- trunk/include/parrot/packfile.h	Sat Feb 14 06:04:04 2009	(r36715)
+++ trunk/include/parrot/packfile.h	Sat Feb 14 07:12:45 2009	(r36716)
@@ -41,9 +41,9 @@
 #define TRACE_PACKFILE 0
 
 #if TRACE_PACKFILE
-#  define TRACE_PRINTF(args)       if (pf->options) Parrot_trace_eprintf args
+#  define TRACE_PRINTF(args)       if (pf->options) Parrot_trace_eprintf (args)
 #  if TRACE_PACKFILE == 2
-#    define TRACE_PRINTF_VAL(args) if (pf->options & 2) Parrot_trace_eprintf args
+#    define TRACE_PRINTF_VAL(args) if (pf->options & 2) Parrot_trace_eprintf (args)
 #  else
 #    define TRACE_PRINTF_VAL(args)
 #  endif

Modified: trunk/src/byteorder.c
==============================================================================
--- trunk/src/byteorder.c	Sat Feb 14 06:04:04 2009	(r36715)
+++ trunk/src/byteorder.c	Sat Feb 14 07:12:45 2009	(r36716)
@@ -97,7 +97,7 @@
 #  if INTVAL_SIZE == 4
     return (w << 24) | ((w & 0xff00) << 8) | ((w & 0xff0000) >> 8) | (w >> 24);
 #  else
-#      if INTVAL_SIZE == 8
+#    if INTVAL_SIZE == 8
     INTVAL r;
     r = w << 56;
     r |= (w & 0xff00) << 40;
@@ -108,10 +108,10 @@
     r |= (w & 0xff000000000000) >> 40;
     r |= (w & 0xff00000000000000) >> 56;
     return r;
-#      else
+#    else
     exit_fatal(1, "Unsupported INTVAL_SIZE=%d\n",
                INTVAL_SIZE);
-#      endif
+#    endif
 #  endif
 #endif
 }

Modified: trunk/src/packfile.c
==============================================================================
--- trunk/src/packfile.c	Sat Feb 14 06:04:04 2009	(r36715)
+++ trunk/src/packfile.c	Sat Feb 14 07:12:45 2009	(r36716)
@@ -460,6 +460,7 @@
 void
 Parrot_trace_eprintf(ARGIN(const char *s), ...)
 {
+    ASSERT_ARGS(Parrot_trace_eprintf)
     va_list args;
     va_start(args, s);
     vfprintf(stderr, s, args);

Modified: trunk/src/packfile/pf_items.c
==============================================================================
--- trunk/src/packfile/pf_items.c	Sat Feb 14 06:04:04 2009	(r36715)
+++ trunk/src/packfile/pf_items.c	Sat Feb 14 07:12:45 2009	(r36716)
@@ -1129,8 +1129,9 @@
             pf->fetch_nv = cvt_num16_num8;
         else {
             exit_fatal(1,
-                       "PackFile_unpack: unsupported float conversion %d to %d, PARROT_BIGENDIAN=%d\n",
-                       NUMVAL_SIZE, pf->header->floattype, PARROT_BIGENDIAN);
+                       "PackFile_unpack: unsupported float conversion %d to %d,"
+                       " PARROT_BIGENDIAN=%d\n", NUMVAL_SIZE,
+                       pf->header->floattype, PARROT_BIGENDIAN);
         }
     }
 
@@ -1154,8 +1155,9 @@
             pf->fetch_nv = cvt_num16_num8_be;
         else {
             exit_fatal(1,
-                       "PackFile_unpack: unsupported float conversion %d to %d, PARROT_BIGENDIAN=%d\n",
-                       NUMVAL_SIZE, pf->header->floattype, PARROT_BIGENDIAN);
+                       "PackFile_unpack: unsupported float conversion %d to %d,"
+                       " PARROT_BIGENDIAN=%d\n", NUMVAL_SIZE,
+                       pf->header->floattype, PARROT_BIGENDIAN);
             return;
         }
     }
@@ -1179,8 +1181,9 @@
             pf->fetch_nv = cvt_num16_num8;
         else {
             exit_fatal(1,
-                       "PackFile_unpack: unsupported float conversion %d to %d, PARROT_BIGENDIAN=%d\n",
-                       NUMVAL_SIZE, pf->header->floattype, PARROT_BIGENDIAN);
+                       "PackFile_unpack: unsupported float conversion %d to %d,"
+                       " PARROT_BIGENDIAN=%d\n", NUMVAL_SIZE,
+                       pf->header->floattype, PARROT_BIGENDIAN);
         }
     }
 #endif