summaryrefslogtreecommitdiffstats
path: root/libass/ass_library.c
diff options
context:
space:
mode:
authorgreg <greg@blackbox>2009-06-18 17:54:08 +0200
committergreg <greg@blackbox>2009-06-20 03:38:00 +0200
commit2303b5430337da60f582613f95e605f08606759f (patch)
tree7ab52c9de634da3dfe55e1f36e87030beff2a3fe /libass/ass_library.c
parent9c7521c0224f16880870839f7492e50b1c8602f7 (diff)
downloadlibass-2303b5430337da60f582613f95e605f08606759f.tar.bz2
libass-2303b5430337da60f582613f95e605f08606759f.tar.xz
Reindent all source code.
Reindent complete source code (*.c, *.h) with indent, the exact command line being: indent -kr -i4 -bap -nut -l76 *.c *.h From now on, new code should use (more or less) K&R style, only spaces and no tabs, 4 spaces indent width. Avoid long lines. Fix function declaration pointer spacing. Remove spaces that were added to many function declarations by indent, like some_func(foo_t * bar). Fix indenting of macros in ass.c
Diffstat (limited to 'libass/ass_library.c')
-rw-r--r--libass/ass_library.c115
1 files changed, 58 insertions, 57 deletions
diff --git a/libass/ass_library.c b/libass/ass_library.c
index 304f232..ce877da 100644
--- a/libass/ass_library.c
+++ b/libass/ass_library.c
@@ -1,5 +1,3 @@
-// -*- c-basic-offset: 8; indent-tabs-mode: t -*-
-// vim:ts=8:sw=8:noet:ai:
/*
* Copyright (C) 2006 Evgeniy Stepanov <eugeni.stepanov@gmail.com>
*
@@ -29,87 +27,90 @@
#include "ass_library.h"
-ass_library_t* ass_library_init(void)
+ass_library_t *ass_library_init(void)
{
- return calloc(1, sizeof(ass_library_t));
+ return calloc(1, sizeof(ass_library_t));
}
-void ass_library_done(ass_library_t* priv)
+void ass_library_done(ass_library_t *priv)
{
- if (priv) {
- ass_set_fonts_dir(priv, NULL);
- ass_set_style_overrides(priv, NULL);
- ass_clear_fonts(priv);
- free(priv);
- }
+ if (priv) {
+ ass_set_fonts_dir(priv, NULL);
+ ass_set_style_overrides(priv, NULL);
+ ass_clear_fonts(priv);
+ free(priv);
+ }
}
-void ass_set_fonts_dir(ass_library_t* priv, const char* fonts_dir)
+void ass_set_fonts_dir(ass_library_t *priv, const char *fonts_dir)
{
- if (priv->fonts_dir)
- free(priv->fonts_dir);
+ if (priv->fonts_dir)
+ free(priv->fonts_dir);
- priv->fonts_dir = fonts_dir ? strdup(fonts_dir) : 0;
+ 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_t *priv, int extract)
{
- priv->extract_fonts = !!extract;
+ priv->extract_fonts = !!extract;
}
-void ass_set_style_overrides(ass_library_t* priv, char** list)
+void ass_set_style_overrides(ass_library_t *priv, char **list)
{
- char** p;
- char** q;
- int cnt;
-
- if (priv->style_overrides) {
- for (p = priv->style_overrides; *p; ++p)
- free(*p);
- free(priv->style_overrides);
- }
-
- if (!list) return;
-
- for (p = list, cnt = 0; *p; ++p, ++cnt) {}
-
- priv->style_overrides = malloc((cnt + 1) * sizeof(char*));
- for (p = list, q = priv->style_overrides; *p; ++p, ++q)
- *q = strdup(*p);
- priv->style_overrides[cnt] = NULL;
+ char **p;
+ char **q;
+ int cnt;
+
+ if (priv->style_overrides) {
+ for (p = priv->style_overrides; *p; ++p)
+ free(*p);
+ free(priv->style_overrides);
+ }
+
+ if (!list)
+ return;
+
+ for (p = list, cnt = 0; *p; ++p, ++cnt) {
+ }
+
+ priv->style_overrides = malloc((cnt + 1) * sizeof(char *));
+ for (p = list, q = priv->style_overrides; *p; ++p, ++q)
+ *q = strdup(*p);
+ priv->style_overrides[cnt] = NULL;
}
static void grow_array(void **array, int nelem, size_t elsize)
{
- if (!(nelem & 31))
- *array = realloc(*array, (nelem + 32) * elsize);
+ if (!(nelem & 31))
+ *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_t *priv, char *name, char *data, int size)
{
- int idx = priv->num_fontdata;
- if (!name || !data || !size)
- return;
- grow_array((void**)&priv->fontdata, priv->num_fontdata, sizeof(*priv->fontdata));
+ int idx = priv->num_fontdata;
+ if (!name || !data || !size)
+ return;
+ grow_array((void **) &priv->fontdata, priv->num_fontdata,
+ sizeof(*priv->fontdata));
- priv->fontdata[idx].name = strdup(name);
+ priv->fontdata[idx].name = strdup(name);
- priv->fontdata[idx].data = malloc(size);
- memcpy(priv->fontdata[idx].data, data, size);
+ priv->fontdata[idx].data = malloc(size);
+ memcpy(priv->fontdata[idx].data, data, size);
- priv->fontdata[idx].size = size;
+ priv->fontdata[idx].size = size;
- priv->num_fontdata ++;
+ priv->num_fontdata++;
}
-void ass_clear_fonts(ass_library_t* priv)
+void ass_clear_fonts(ass_library_t *priv)
{
- int i;
- for (i = 0; i < priv->num_fontdata; ++i) {
- free(priv->fontdata[i].name);
- free(priv->fontdata[i].data);
- }
- free(priv->fontdata);
- priv->fontdata = NULL;
- priv->num_fontdata = 0;
+ int i;
+ for (i = 0; i < priv->num_fontdata; ++i) {
+ free(priv->fontdata[i].name);
+ free(priv->fontdata[i].data);
+ }
+ free(priv->fontdata);
+ priv->fontdata = NULL;
+ priv->num_fontdata = 0;
}