From 892423a588aea8fb14e84bdb9527df97e945ec57 Mon Sep 17 00:00:00 2001
From: Grigori Goronzy <greg@blackbox>
Date: Thu, 6 Aug 2009 13:04:20 +0200
Subject: Rename typedefs (breaks API)

Rename all typedefs from the convention foo_bar_t, which can possibly
conflict with POSIX types, to FooBar (and ASS_FooBar for public
API typedefs).  Fix formatting and stray comments while at it.
---
 libass/ass_library.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'libass/ass_library.c')

diff --git a/libass/ass_library.c b/libass/ass_library.c
index 3481b6f..53b91af 100644
--- a/libass/ass_library.c
+++ b/libass/ass_library.c
@@ -37,15 +37,15 @@ static void ass_msg_handler(int level, const char *fmt, va_list va, void *data)
     fprintf(stderr, "\n");
 }
 
-ass_library_t *ass_library_init(void)
+ASS_Library *ass_library_init(void)
 {
-    ass_library_t* lib = calloc(1, sizeof(ass_library_t));
+    ASS_Library* lib = calloc(1, sizeof(*lib));
     lib->msg_callback = ass_msg_handler;
 
     return lib;
 }
 
-void ass_library_done(ass_library_t *priv)
+void ass_library_done(ASS_Library *priv)
 {
     if (priv) {
         ass_set_fonts_dir(priv, NULL);
@@ -55,7 +55,7 @@ void ass_library_done(ass_library_t *priv)
     }
 }
 
-void ass_set_fonts_dir(ass_library_t *priv, const char *fonts_dir)
+void ass_set_fonts_dir(ASS_Library *priv, const char *fonts_dir)
 {
     if (priv->fonts_dir)
         free(priv->fonts_dir);
@@ -63,12 +63,12 @@ void ass_set_fonts_dir(ass_library_t *priv, const char *fonts_dir)
     priv->fonts_dir = fonts_dir ? strdup(fonts_dir) : 0;
 }
 
-void ass_set_extract_fonts(ass_library_t *priv, int extract)
+void ass_set_extract_fonts(ASS_Library *priv, int extract)
 {
     priv->extract_fonts = !!extract;
 }
 
-void ass_set_style_overrides(ass_library_t *priv, char **list)
+void ass_set_style_overrides(ASS_Library *priv, char **list)
 {
     char **p;
     char **q;
@@ -98,7 +98,7 @@ static void grow_array(void **array, int nelem, size_t elsize)
         *array = realloc(*array, (nelem + 32) * elsize);
 }
 
-void ass_add_font(ass_library_t *priv, char *name, char *data, int size)
+void ass_add_font(ASS_Library *priv, char *name, char *data, int size)
 {
     int idx = priv->num_fontdata;
     if (!name || !data || !size)
@@ -116,7 +116,7 @@ void ass_add_font(ass_library_t *priv, char *name, char *data, int size)
     priv->num_fontdata++;
 }
 
-void ass_clear_fonts(ass_library_t *priv)
+void ass_clear_fonts(ASS_Library *priv)
 {
     int i;
     for (i = 0; i < priv->num_fontdata; ++i) {
@@ -136,7 +136,7 @@ void ass_clear_fonts(ass_library_t *priv)
  * \param msg_cb the callback function
  * \param data additional data that will be passed to the callback
  */
-void ass_set_message_cb(ass_library_t *priv,
+void ass_set_message_cb(ASS_Library *priv,
                         void (*msg_cb)(int, const char *, va_list, void *),
                         void *data)
 {
-- 
cgit v1.2.3