From 571de1af04e50891a69d634cadae65bce6dc876d Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Thu, 23 Mar 2006 13:12:56 +0000
Subject: [PATCH]   * Renamed cucul_init()/cucul_end() into
 cucul_create()/cucul_free().

---
 cucul/cucul.c    | 12 ++++++------
 cucul/cucul.h    |  4 ++--
 src/aafire.c     |  4 ++--
 src/cacaball.c   |  4 ++--
 src/cacamoir.c   |  4 ++--
 src/cacaplas.c   |  4 ++--
 src/cacaview.c   |  4 ++--
 test/colors.c    |  4 ++--
 test/demo.c      |  4 ++--
 test/dithering.c |  4 ++--
 test/event.c     |  4 ++--
 test/export.c    |  4 ++--
 test/gamma.c     |  8 ++++----
 test/hsv.c       |  4 ++--
 test/spritedit.c |  6 +++---
 test/transform.c | 16 ++++++++++------
 test/unicode.c   |  4 ++--
 17 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/cucul/cucul.c b/cucul/cucul.c
index cbac192..9aa9deb 100644
--- a/cucul/cucul.c
+++ b/cucul/cucul.c
@@ -34,7 +34,7 @@ static void cucul_read_environment(cucul_t *);
  *
  *  This function initialises internal \e libcucul structures and the backend
  *  that will be used for subsequent graphical operations. It must be the
- *  first \e libcucul function to be called in a function. cucul_end() should
+ *  first \e libcucul function to be called in a function. cucul_free() should
  *  be called at the end of the program to free all allocated resources.
  *
  *  If one of the desired canvas coordinates is zero, a default canvas size
@@ -44,7 +44,7 @@ static void cucul_read_environment(cucul_t *);
  *  \param height The desired canvas height
  *  \return 0 upon success, a non-zero value if an error occurs.
  */
-cucul_t * cucul_init(unsigned int width, unsigned int height)
+cucul_t * cucul_create(unsigned int width, unsigned int height)
 {
     cucul_t *qq = malloc(sizeof(cucul_t));
 
@@ -260,11 +260,11 @@ char const *cucul_get_feature_name(enum cucul_feature feature)
 
 /** \brief Uninitialise \e libcucul.
  *
- *  This function frees all resources allocated by cucul_init(). After
- *  cucul_end() has been called, no other \e libcucul functions may be used
- *  unless a new call to cucul_init() is done.
+ *  This function frees all resources allocated by cucul_create(). After
+ *  cucul_free() has been called, no other \e libcucul functions may be used
+ *  unless a new call to cucul_create() is done.
  */
-void cucul_end(cucul_t *qq)
+void cucul_free(cucul_t *qq)
 {
     _cucul_end_bitmap();
 
diff --git a/cucul/cucul.h b/cucul/cucul.h
index 77e183c..dffeaf5 100644
--- a/cucul/cucul.h
+++ b/cucul/cucul.h
@@ -118,14 +118,14 @@ typedef struct cucul_context cucul_t;
  *  initialisation, system information retrieval and configuration.
  *
  *  @{ */
-cucul_t * cucul_init(unsigned int, unsigned int);
+cucul_t * cucul_create(unsigned int, unsigned int);
 void cucul_set_size(cucul_t *, unsigned int, unsigned int);
 unsigned int cucul_get_width(cucul_t *);
 unsigned int cucul_get_height(cucul_t *);
 enum cucul_feature cucul_get_feature(cucul_t *, enum cucul_feature);
 void cucul_set_feature(cucul_t *, enum cucul_feature);
 char const *cucul_get_feature_name(enum cucul_feature);
-void cucul_end(cucul_t *);
+void cucul_free(cucul_t *);
 /*  @} */
 
 /** \defgroup canvas Canvas drawing
diff --git a/src/aafire.c b/src/aafire.c
index 8c4f3ef..18d5489 100644
--- a/src/aafire.c
+++ b/src/aafire.c
@@ -100,7 +100,7 @@ initialize (void)
 #endif
 
 #ifdef LIBCACA
-  qq = cucul_init(80, 32);
+  qq = cucul_create(80, 32);
   if (!qq)
     {
       printf ("Failed to initialize libcucul\n");
@@ -153,7 +153,7 @@ uninitialize (void)
 {
 #ifdef LIBCACA
   caca_detach(kk);
-  cucul_end(qq);
+  cucul_free(qq);
 #else
   aa_close (context);
 #endif
diff --git a/src/cacaball.c b/src/cacaball.c
index dbd11d5..a332c6b 100644
--- a/src/cacaball.c
+++ b/src/cacaball.c
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
     double frameOffset40[360];
     double frameOffset80[360];
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     if(!qq)
         return 1;
     kk = caca_attach(qq);
@@ -159,7 +159,7 @@ paused:
 end:
     cucul_free_bitmap(cucul_bitmap);
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/src/cacamoir.c b/src/cacamoir.c
index 86341df..b2f299e 100644
--- a/src/cacamoir.c
+++ b/src/cacamoir.c
@@ -42,7 +42,7 @@ int main (int argc, char **argv)
     struct cucul_bitmap *bitmap;
     int i, x, y, frame = 0, pause = 0;
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     if(!qq)
         return 1;
     kk = caca_attach(qq);
@@ -111,7 +111,7 @@ paused:
 end:
     cucul_free_bitmap(bitmap);
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/src/cacaplas.c b/src/cacaplas.c
index 4557d0c..a98e30d 100644
--- a/src/cacaplas.c
+++ b/src/cacaplas.c
@@ -45,7 +45,7 @@ int main (int argc, char **argv)
     struct cucul_bitmap *bitmap;
     int i, x, y, frame = 0, pause = 0;
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     if(!qq)
         return 1;
     kk = caca_attach(qq);
@@ -123,7 +123,7 @@ paused:
 end:
     cucul_free_bitmap(bitmap);
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/src/cacaview.c b/src/cacaview.c
index c4a5a27..9895682 100644
--- a/src/cacaview.c
+++ b/src/cacaview.c
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
     int i;
 
     /* Initialise libcucul */
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     if(!qq)
     {
         fprintf(stderr, "%s: unable to initialise libcucul\n", argv[0]);
@@ -421,7 +421,7 @@ int main(int argc, char **argv)
     /* Clean up */
     unload_image();
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/test/colors.c b/test/colors.c
index e505e8e..b964dc6 100644
--- a/test/colors.c
+++ b/test/colors.c
@@ -26,7 +26,7 @@ int main(int argc, char **argv)
     caca_t *kk;
     int i, j;
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     if(!qq)
         return 1;
 
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
     caca_wait_event(kk, CACA_EVENT_KEY_PRESS);
 
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/test/demo.c b/test/demo.c
index 223bdeb..f14fe36 100644
--- a/test/demo.c
+++ b/test/demo.c
@@ -45,7 +45,7 @@ int main(int argc, char **argv)
     void (*demo)(void) = NULL;
     int quit = 0;
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     if(!qq)
         return 1;
     kk = caca_attach(qq);
@@ -175,7 +175,7 @@ int main(int argc, char **argv)
     /* Clean up */
     cucul_free_sprite(sprite);
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/test/dithering.c b/test/dithering.c
index 37abe27..8d6a987 100644
--- a/test/dithering.c
+++ b/test/dithering.c
@@ -39,7 +39,7 @@ int main(void)
     int neara, dista, nearb, distb, dist;
     int x, y;
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     kk = caca_attach(qq);
 
     for(x = 0; x < 100; x++)
@@ -126,7 +126,7 @@ int main(void)
     while(!caca_get_event(kk, CACA_EVENT_KEY_PRESS));
 
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/test/event.c b/test/event.c
index 09fe280..9d1e6d3 100644
--- a/test/event.c
+++ b/test/event.c
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
     int *events;
     int i, h, quit;
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     if(!qq)
         return 1;
     kk = caca_attach(qq);
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
 
     /* Clean up */
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/test/export.c b/test/export.c
index cc50333..10d0f22 100644
--- a/test/export.c
+++ b/test/export.c
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
         exit(-1);
     }
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     cucul_set_size(qq, WIDTH, HEIGHT);
 
     for(y = 0; y < 256; y++)
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
     fwrite(buffer->buffer, buffer->size - 1, 1, stdout);
     cucul_free_export(buffer);
 
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/test/gamma.c b/test/gamma.c
index c83313e..839f347 100644
--- a/test/gamma.c
+++ b/test/gamma.c
@@ -39,11 +39,11 @@ int main(void)
     float gam = 1.0;
     int x;
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     kk = caca_attach(qq);
 
-    gg = cucul_init(cucul_get_width(qq), cucul_get_height(qq));
-    mask = cucul_init(cucul_get_width(qq), cucul_get_height(qq));
+    gg = cucul_create(cucul_get_width(qq), cucul_get_height(qq));
+    mask = cucul_create(cucul_get_width(qq), cucul_get_height(qq));
 
     for(x = 0; x < 256; x++)
     {
@@ -111,7 +111,7 @@ int main(void)
     cucul_free_bitmap(right);
 
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/test/hsv.c b/test/hsv.c
index 14c4455..a8d6ca5 100644
--- a/test/hsv.c
+++ b/test/hsv.c
@@ -34,7 +34,7 @@ int main(void)
     struct cucul_bitmap *bitmap;
     int x, y;
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     kk = caca_attach(qq);
 
     for(y = 0; y < 256; y++)
@@ -55,7 +55,7 @@ int main(void)
     while(!caca_get_event(kk, CACA_EVENT_KEY_PRESS));
 
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/test/spritedit.c b/test/spritedit.c
index e13ccf0..95cf19c 100644
--- a/test/spritedit.c
+++ b/test/spritedit.c
@@ -33,7 +33,7 @@ int main(int argc, char **argv)
         return 1;
     }
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     if(!qq)
         return 1;
     kk = caca_attach(qq);
@@ -45,7 +45,7 @@ int main(int argc, char **argv)
     if(!sprite)
     {
         caca_detach(kk);
-        cucul_end(qq);
+        cucul_free(qq);
         fprintf(stderr, "%s: could not open `%s'.\n", argv[0], argv[1]);
         return 1;
     }
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
 
     /* Clean up */
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/test/transform.c b/test/transform.c
index 34d98f7..e889470 100644
--- a/test/transform.c
+++ b/test/transform.c
@@ -53,13 +53,13 @@ int main(void)
     caca_t *kk;
     int i;
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     kk = caca_attach(qq);
 
-    normal = cucul_init(70, 6);
-    flip = cucul_init(70, 6);
-    flop = cucul_init(70, 6);
-    rotate = cucul_init(70, 6);
+    normal = cucul_create(70, 6);
+    flip = cucul_create(70, 6);
+    flop = cucul_create(70, 6);
+    rotate = cucul_create(70, 6);
 
     cucul_set_color(normal, CUCUL_COLOR_LIGHTMAGENTA, CUCUL_COLOR_BLACK);
     for(i = 0; pig[i]; i++)
@@ -110,7 +110,11 @@ int main(void)
     while(!caca_get_event(kk, CACA_EVENT_KEY_PRESS));
 
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(rotate);
+    cucul_free(flop);
+    cucul_free(flip);
+    cucul_free(normal);
+    cucul_free(qq);
 
     return 0;
 }
diff --git a/test/unicode.c b/test/unicode.c
index 357a04b..91ff1cd 100644
--- a/test/unicode.c
+++ b/test/unicode.c
@@ -29,7 +29,7 @@ int main(void)
     cucul_t *qq;
     caca_t *kk;
 
-    qq = cucul_init(0, 0);
+    qq = cucul_create(0, 0);
     kk = caca_attach(qq);
 
     cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
@@ -89,7 +89,7 @@ int main(void)
     while(!caca_get_event(kk, CACA_EVENT_KEY_PRESS));
 
     caca_detach(kk);
-    cucul_end(qq);
+    cucul_free(qq);
 
     return 0;
 }