Eliminate make_cleanup_obstack_free, introduce auto_obstack

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

diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index a6d533d082feec8a233a25f45c787cc8d18522d5..de8868b2e66da96d11a57c77c56145f0712df251 100644 (file)
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -570,15 +570,12 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp,
       {
        int oplen, limit;
        struct type *type;
-       struct obstack output;
-       struct cleanup *cleanup;
        struct value *result;
        c_string_type dest_type;
        const char *dest_charset;
        int satisfy_expected = 0;
 
-       obstack_init (&output);
-       cleanup = make_cleanup_obstack_free (&output);
+       auto_obstack output;
 
        ++*pos;
        oplen = longest_to_int (exp->elts[*pos].longconst);
@@ -656,7 +653,6 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp,
              result = allocate_value (type);
            else
              result = value_cstring ("", 0, type);
-           do_cleanups (cleanup);
            return result;
          }
 
@@ -702,7 +698,6 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp,
                                      obstack_object_size (&output),
                                      type);
          }
-       do_cleanups (cleanup);
        return result;
       }
       break;