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 9572f06e22fb0a93e7e98f2a397528cddb9319e2..050e43baaf47fc218e83f74aaf20479d83d14eeb 100644 (file)
--- 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 2eb516bd0610fad0d9074f7eede689a9c9b786c2..e8ba0458c568e90045ff948b56ee709b81d89e77 100644 (file)
--- 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 9e93eb0f22ee95e22a3a52d9ab74523c51071b34..4254f05c6426549402367e7fda2b9aab4beeac91 100644 (file)
--- 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