X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=ucw%2Fconf-intr.c;h=a5d323253a42a3eedc06e71f0f7b77622fdde358;hb=92b3bd34e6024ec20c67e3c1285f3a442fe6f326;hp=3e9445f2240131511998beda66faa2ba6d038e17;hpb=b3d3d2847cb34363c5e7a5a6bf8155b710d7afcd;p=libucw.git diff --git a/ucw/conf-intr.c b/ucw/conf-intr.c index 3e9445f2..a5d32325 100644 --- a/ucw/conf-intr.c +++ b/ucw/conf-intr.c @@ -654,31 +654,5 @@ cf_init_stack(struct cf_context *cc) int cf_done_stack(struct cf_context *cc) { - if (cc->stack_level > 0) { - msg(L_ERROR, "Unterminated block"); // FIXME: Where? - return 1; - } - if (cf_commit_all(cc->postpone_commit ? CF_NO_COMMIT : cc->everything_committed ? CF_COMMIT : CF_COMMIT_ALL)) - return 1; - if (!cc->postpone_commit) - cc->everything_committed = 1; - return 0; -} - -void -cf_open_group(void) -{ - struct cf_context *cc = cf_get_context(); - cc->postpone_commit++; -} - -int -cf_close_group(void) -{ - struct cf_context *cc = cf_get_context(); - ASSERT(cc->postpone_commit); - if (!--cc->postpone_commit) - return cf_done_stack(cc); - else - return 0; + return (cc->stack_level > 0); }