gdb: remove some uses of LA_PRINT_STRING

[deliverable/binutils-gdb.git] / gdb / expprint.c

diff --git a/gdb/expprint.c b/gdb/expprint.c
index 5b4ea14d440b955d29e670f4a70567d172f5ee0d..51dbc567a90a9eff71c8d13af89afab5fb19665a 100644 (file)
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -226,9 +226,10 @@ print_subexp_standard (struct expression *exp, int *pos,
           If necessary, we can temporarily set it to zero, or pass it as an
           additional parameter to LA_PRINT_STRING.  -fnf */
        get_user_print_options (&opts);
-       LA_PRINT_STRING (stream, builtin_type (exp->gdbarch)->builtin_char,
-                        (gdb_byte *) &exp->elts[pc + 2].string, nargs,
-                        NULL, 0, &opts);
+       exp->language_defn
+         ->printstr (stream, builtin_type (exp->gdbarch)->builtin_char,
+                     (gdb_byte *) &exp->elts[pc + 2].string, nargs,
+                     NULL, 0, &opts);
       }
       return;
 
@@ -241,9 +242,10 @@ print_subexp_standard (struct expression *exp, int *pos,
        (*pos) += 3 + BYTES_TO_EXP_ELEM (nargs + 1);
        fputs_filtered ("@\"", stream);
        get_user_print_options (&opts);
-       LA_PRINT_STRING (stream, builtin_type (exp->gdbarch)->builtin_char,
-                        (gdb_byte *) &exp->elts[pc + 2].string, nargs,
-                        NULL, 0, &opts);
+       exp->language_defn
+         ->printstr (stream, builtin_type (exp->gdbarch)->builtin_char,
+                     (gdb_byte *) &exp->elts[pc + 2].string, nargs,
+                     NULL, 0, &opts);
        fputs_filtered ("\"", stream);
       }
       return;
@@ -325,8 +327,9 @@ print_subexp_standard (struct expression *exp, int *pos,
          struct value_print_options opts;
 
          get_user_print_options (&opts);
-         LA_PRINT_STRING (stream, builtin_type (exp->gdbarch)->builtin_char,
-                          (gdb_byte *) tempstr, nargs - 1, NULL, 0, &opts);
+         exp->language_defn
+           ->printstr (stream, builtin_type (exp->gdbarch)->builtin_char,
+                       (gdb_byte *) tempstr, nargs - 1, NULL, 0, &opts);
          (*pos) = pc;
        }
       else