From: Martin Mares Date: Sun, 29 Apr 2012 11:25:21 +0000 (+0200) Subject: Conf: Renamed cf_free_context() to cf_delete_context() X-Git-Tag: v5.99~168 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=731e7fbc3e2a8c1b03a4657002a6a701b502ff07;p=libucw.git Conf: Renamed cf_free_context() to cf_delete_context() This way, it is consistent with the other LibUCW modules. --- diff --git a/ucw/conf-context.c b/ucw/conf-context.c index 9572f06e..050e43ba 100644 --- a/ucw/conf-context.c +++ b/ucw/conf-context.c @@ -30,7 +30,7 @@ cf_new_context(void) } void -cf_free_context(struct cf_context *cc) +cf_delete_context(struct cf_context *cc) { ASSERT(!cc->is_active); ASSERT(cc != &cf_default_context); diff --git a/ucw/conf-test.c b/ucw/conf-test.c index 2eb516bd..e8ba0458 100644 --- a/ucw/conf-test.c +++ b/ucw/conf-test.c @@ -236,10 +236,8 @@ main(int argc, char *argv[]) if (cc) { cf_switch_context(prev); - cf_free_context(cc); + cf_delete_context(cc); } - printf("%08x\n", ip); - return 0; } diff --git a/ucw/conf.h b/ucw/conf.h index 9e93eb0f..4254f05c 100644 --- a/ucw/conf.h +++ b/ucw/conf.h @@ -41,7 +41,7 @@ struct cf_context *cf_new_context(void); * of the context is freed, which includes memory obtained by calls to * cf_malloc(). **/ -void cf_free_context(struct cf_context *cc); +void cf_delete_context(struct cf_context *cc); /** * Make the given configuration context current and return the previously