[svn:parrot] r49131 - in trunk: include/parrot src/pmc

[plobsing at svn.parrot.org]

Author: plobsing
Date: Sat Sep 18 04:03:13 2010
New Revision: 49131
URL: https://trac.parrot.org/parrot/changeset/49131

Log:
make codingstd happier

Modified:
   trunk/include/parrot/imageio.h   (contents, props changed)
   trunk/src/pmc/imageiofreeze.pmc   (contents, props changed)
   trunk/src/pmc/imageiothaw.pmc   (contents, props changed)

Modified: trunk/include/parrot/imageio.h
==============================================================================
--- trunk/include/parrot/imageio.h	Sat Sep 18 03:47:34 2010	(r49130)
+++ trunk/include/parrot/imageio.h	Sat Sep 18 04:03:13 2010	(r49131)
@@ -1,3 +1,6 @@
+/* Copyright (C) 2001-2009, Parrot Foundation.
+ * $Id$
+ */
 #ifndef PARROT_IMAGEIO_H_GUARD
 #define PARROT_IMAGEIO_H_GUARD
 
@@ -21,3 +24,10 @@
 };
 
 #endif /* PARROT_IMAGEIO_H_GUARD */
+
+/*
+ * Local variables:
+ *   c-file-style: "parrot"
+ * End:
+ * vim: expandtab shiftwidth=4:
+ */

Modified: trunk/src/pmc/imageiofreeze.pmc
==============================================================================
--- trunk/src/pmc/imageiofreeze.pmc	Sat Sep 18 03:47:34 2010	(r49130)
+++ trunk/src/pmc/imageiofreeze.pmc	Sat Sep 18 04:03:13 2010	(r49131)
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2010, Parrot Foundation.
-$Id: imageio.pmc 49125 2010-09-18 00:48:46Z plobsing $
+$Id$
 
 =head1 NAME
 
@@ -54,11 +54,6 @@
         __attribute__nonnull__(1)
         FUNC_MODIFIES(*pmc);
 
-PARROT_WARN_UNUSED_RESULT
-PARROT_INLINE
-static INTVAL INFO_HAS_DATA(ARGIN(const PMC *io))
-        __attribute__nonnull__(1);
-
 PARROT_INLINE
 static void SET_VISIT_CURSOR(ARGMOD(PMC *pmc), ARGIN(const char *cursor))
         __attribute__nonnull__(1)
@@ -78,8 +73,6 @@
     , PARROT_ASSERT_ARG(io))
 #define ASSERT_ARGS_INC_VISIT_CURSOR __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(pmc))
-#define ASSERT_ARGS_INFO_HAS_DATA __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(io))
 #define ASSERT_ARGS_SET_VISIT_CURSOR __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(pmc) \
     , PARROT_ASSERT_ARG(cursor))

Modified: trunk/src/pmc/imageiothaw.pmc
==============================================================================
--- trunk/src/pmc/imageiothaw.pmc	Sat Sep 18 03:47:34 2010	(r49130)
+++ trunk/src/pmc/imageiothaw.pmc	Sat Sep 18 04:03:13 2010	(r49131)
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2010, Parrot Foundation.
-$Id: imageio.pmc 48634 2010-08-24 17:14:54Z plobsing $
+$Id$
 
 =head1 NAME
 
@@ -23,7 +23,7 @@
 #define BYTECODE_SHIFT_OK(interp, pmc) PARROT_ASSERT( \
     PARROT_IMAGEIOTHAW(pmc)->curs <= \
     PARROT_IMAGEIOTHAW(pmc)->image->strstart + \
-    Parrot_str_byte_length(interp, PARROT_IMAGEIOTHAW(pmc)->image->strstart))
+    Parrot_str_byte_length((interp), PARROT_IMAGEIOTHAW(pmc)->image->strstart))
 
 
 /* HEADERIZER HFILE: none */
@@ -98,11 +98,11 @@
 */
 
     VTABLE void set_string_native(STRING *image) {
-	if (!PObj_external_TEST(image))
-	    Parrot_str_pin(INTERP, image);
+        if (!PObj_external_TEST(image))
+            Parrot_str_pin(INTERP, image);
 
-	PARROT_IMAGEIOTHAW(SELF)->img  = image;
-	PARROT_IMAGEIOTHAW(SELF)->curs = (opcode_t *)image->strstart;
+        PARROT_IMAGEIOTHAW(SELF)->img  = image;
+        PARROT_IMAGEIOTHAW(SELF)->curs = (opcode_t *)image->strstart;
 
         if (PObj_flag_TEST(private1, SELF)) {
             PARROT_IMAGEIOTHAW(SELF)->pf = PARROT_IMAGEIOTHAW(SELF)->pf_ct->base.pf;
@@ -117,7 +117,8 @@
 
             PARROT_IMAGEIOTHAW(SELF)->pf->options |= PFOPT_PMC_FREEZE_ONLY;
             unpacked_length = PackFile_unpack(INTERP, PARROT_IMAGEIOTHAW(SELF)->pf,
-                                PARROT_IMAGEIOTHAW(SELF)->curs, Parrot_str_byte_length(interp, image));
+                                PARROT_IMAGEIOTHAW(SELF)->curs,
+                                Parrot_str_byte_length(interp, image));
 
             if (unpacked_length)
                 PARROT_IMAGEIOTHAW(SELF)->curs += header_length / sizeof (opcode_t*);
@@ -125,19 +126,19 @@
                 Parrot_ex_throw_from_c_args(INTERP, NULL,
                         EXCEPTION_INVALID_STRING_REPRESENTATION,
                         "PackFile header failed during unpack");
-	}
+        }
 
-	STATICSELF.shift_pmc();
-	Parrot_visit_loop_visit(INTERP, SELF);
+        STATICSELF.shift_pmc();
+        Parrot_visit_loop_visit(INTERP, SELF);
 
-	/* we're done reading the image */
-	PARROT_ASSERT(image->strstart + Parrot_str_byte_length(interp, image) ==
+        /* we're done reading the image */
+        PARROT_ASSERT(image->strstart + Parrot_str_byte_length(interp, image) ==
                     PARROT_IMAGEIOTHAW(SELF)->curs);
 
-	Parrot_visit_loop_thawfinish(INTERP, SELF);
+        Parrot_visit_loop_thawfinish(INTERP, SELF);
 
-	if (!PObj_external_TEST(image))
-	    Parrot_str_unpin(INTERP, image);
+        if (!PObj_external_TEST(image))
+            Parrot_str_unpin(INTERP, image);
     }