1 files changed, 16 insertions, 16 deletions

diff --git a/gs/base/sfilter2.c b/gs/base/sfilter2.c
index 93b3453df..40d556b83 100644
--- a/gs/base/sfilter2.c
+++ b/gs/base/sfilter2.c
@@ -52,8 +52,8 @@ s_A85E_process(stream_state * st, stream_cursor_read * pr,
     int prev = ss->last_char;
     int count;
 
-    if_debug3('w', "[w85]initial ss->count = %d, rcount = %d, wcount = %d\n",
-              ss->count, (int)(rlimit - p), (int)(wlimit - q));
+    if_debug3m('w', ss->memory, "[w85]initial ss->count = %d, rcount = %d, wcount = %d\n",
+               ss->count, (int)(rlimit - p), (int)(wlimit - q));
     for (; (count = rlimit - p) >= 4; p += 4) {
         ulong word =
             ((ulong) (((uint) p[1] << 8) + p[2]) << 16) +
@@ -67,7 +67,7 @@ s_A85E_process(stream_state * st, stream_cursor_read * pr,
                 }
                 *++q = prev = '\n';
                 qn = q + LINE_LIMIT;
-                if_debug1('w', "[w85]EOL at %d bytes written\n",
+                if_debug1m('w', ss->memory, "[w85]EOL at %d bytes written\n",
                           (int)(q - pw->ptr));
             } else {
                 if (q >= wlimit) {
@@ -89,8 +89,8 @@ put:	    if (q + 5 > qn) {
                 }
                 *++q = prev = '\n';
                 qn = q + LINE_LIMIT;
-                if_debug1('w', "[w85]EOL at %d bytes written\n",
-                          (int)(q - pw->ptr));
+                if_debug1m('w', ss->memory, "[w85]EOL at %d bytes written\n",
+                           (int)(q - pw->ptr));
                 goto put;
             }
             if (wlimit - q < 5) {
@@ -113,9 +113,9 @@ put:	    if (q + 5 > qn) {
                         /* A line would begin with %%. */
                         *++q = prev = '\n';
                         qn = q + LINE_LIMIT;
-                        if_debug1('w',
-                                  "[w85]EOL for %%%% at %d bytes written\n",
-                                  (int)(q - pw->ptr));
+                        if_debug1m('w', ss->memory,
+                                   "[w85]EOL for %%%% at %d bytes written\n",
+                                   (int)(q - pw->ptr));
                         goto put;
                     }
                 } else if (prev == '\n' && (q[2] == '%' || q[2] == '!')) {
@@ -136,8 +136,8 @@ put:	    if (q + 5 > qn) {
                         status = 1;
                         break;
                     }
-                    if_debug6('w', "[w]%c%c%c%c%c extra = %d\n",
-                              q[1], q[2], q[3], q[4], q[5], extra);
+                    if_debug6m('w', ss->memory, "[w]%c%c%c%c%c extra = %d\n",
+                               q[1], q[2], q[3], q[4], q[5], extra);
                     switch (extra) {
                         case 4:
                             q[9] = q[5], q[8] = '\n';
@@ -154,8 +154,8 @@ put:	    if (q + 5 > qn) {
                             q[6] = q[5], q[5] = q[4], q[4] = q[3];
                           e1:q[3] = q[2], q[2] = '\n';
                     }
-                    if_debug1('w', "[w85]EOL at %d bytes written\n",
-                              (int)(q + 2 * extra - pw->ptr));
+                    if_debug1m('w', ss->memory, "[w85]EOL at %d bytes written\n",
+                               (int)(q + 2 * extra - pw->ptr));
                     qn = q + 2 * extra + LINE_LIMIT;
                     q += extra;
                 }
@@ -165,8 +165,8 @@ put:	    if (q + 5 > qn) {
                 /* A line would begin with %!. */
                 *++q = prev = '\n';
                 qn = q + LINE_LIMIT;
-                if_debug1('w', "[w85]EOL for %%! at %d bytes written\n",
-                          (int)(q - pw->ptr));
+                if_debug1m('w', ss->memory, "[w85]EOL for %%! at %d bytes written\n",
+                           (int)(q - pw->ptr));
                 goto put;
             }
             prev = *(q += 5);
@@ -220,8 +220,8 @@ put:	    if (q + 5 > qn) {
             *++q = '>';
         }
     }
-    if_debug3('w', "[w85]final ss->count = %d, %d bytes read, %d written\n",
-              ss->count, (int)(p - pr->ptr), (int)(q - pw->ptr));
+    if_debug3m('w', ss->memory, "[w85]final ss->count = %d, %d bytes read, %d written\n",
+               ss->count, (int)(p - pr->ptr), (int)(q - pw->ptr));
     pr->ptr = p;
     if (q > pw->ptr)
         ss->last_char = *q;