[svn:mod_parrot] r334 - mod_parrot/trunk/src

Author: jhorwitz
Date: Tue Apr 22 10:07:02 2008
New Revision: 334

Modified:
   mod_parrot/trunk/src/parrot_util.c

Log:
fixes for 0.6.1 compatibility


Modified: mod_parrot/trunk/src/parrot_util.c
==============================================================================
--- mod_parrot/trunk/src/parrot_util.c	(original)
+++ mod_parrot/trunk/src/parrot_util.c	Tue Apr 22 10:07:02 2008
@@ -170,12 +170,11 @@
     PMC *sub;
     PMC *old = PMCNULL;
     int rec_level = 0;
-    parrot_context_t *ctx;
+    parrot_context_t *ctx = CONTEXT(interp);
     char *trace_string;
 
     /* information about the current sub */
     sub = interpinfo_p(interp, CURRENT_SUB);
-    ctx = CONTEXT(interp->ctx);
     if (!PMC_IS_NULL(sub)) {
         str = Parrot_Context_infostr(interp, ctx);
         if (str)
@@ -200,7 +199,7 @@
             PMC_cont(sub)->to_ctx->current_sub) {
             ++rec_level;
         } else if (rec_level != 0) {
-            string_nprintf(interp, buf, 0, "... call repeated %d times\n",
+            buf = string_printf(interp, "... call repeated %d times\n",
                 rec_level);
             buf = string_concat(interp, buf, str, 0);
             rec_level = 0;
@@ -217,8 +216,7 @@
             break;
     }
     if (rec_level != 0) {
-        string_nprintf(interp, buf, 0, "... call repeated %d times\n",
-            rec_level);
+        buf = string_printf(interp, "... call repeated %d times\n", rec_level);
     }
 
     trace_string = string_to_cstring(interp, buf);