diff options
author | greg <greg@blackbox> | 2009-06-18 17:54:08 +0200 |
---|---|---|
committer | greg <greg@blackbox> | 2009-06-20 03:38:00 +0200 |
commit | 2303b5430337da60f582613f95e605f08606759f (patch) | |
tree | 7ab52c9de634da3dfe55e1f36e87030beff2a3fe /libass/ass_utils.c | |
parent | 9c7521c0224f16880870839f7492e50b1c8602f7 (diff) | |
download | libass-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_utils.c')
-rw-r--r-- | libass/ass_utils.c | 166 |
1 files changed, 91 insertions, 75 deletions
diff --git a/libass/ass_utils.c b/libass/ass_utils.c index 9a89e8a..73e7433 100644 --- a/libass/ass_utils.c +++ b/libass/ass_utils.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> * @@ -30,106 +28,124 @@ #include "mputils.h" #include "ass_utils.h" -int mystrtoi(char** p, int* res) +int mystrtoi(char **p, int *res) { - // NOTE: base argument is ignored, but not used in libass anyway - double temp_res; - char* start = *p; - temp_res = strtod(*p, p); - *res = (int) (temp_res + 0.5); - if (*p != start) return 1; - else return 0; + // NOTE: base argument is ignored, but not used in libass anyway + double temp_res; + char *start = *p; + temp_res = strtod(*p, p); + *res = (int) (temp_res + 0.5); + if (*p != start) + return 1; + else + return 0; } -int mystrtoll(char** p, long long* res) +int mystrtoll(char **p, long long *res) { - double temp_res; - char* start = *p; - temp_res = strtod(*p, p); - *res = (long long) (temp_res + 0.5); - if (*p != start) return 1; - else return 0; + double temp_res; + char *start = *p; + temp_res = strtod(*p, p); + *res = (long long) (temp_res + 0.5); + if (*p != start) + return 1; + else + return 0; } -int mystrtou32(char** p, int base, uint32_t* res) +int mystrtou32(char **p, int base, uint32_t *res) { - char* start = *p; - *res = strtoll(*p, p, base); - if (*p != start) return 1; - else return 0; + char *start = *p; + *res = strtoll(*p, p, base); + if (*p != start) + return 1; + else + return 0; } -int mystrtod(char** p, double* res) +int mystrtod(char **p, double *res) { - char* start = *p; - *res = strtod(*p, p); - if (*p != start) return 1; - else return 0; + char *start = *p; + *res = strtod(*p, p); + if (*p != start) + return 1; + else + return 0; } -int strtocolor(char** q, uint32_t* res) +int strtocolor(char **q, uint32_t *res) { - uint32_t color = 0; - int result; - char* p = *q; + uint32_t color = 0; + int result; + char *p = *q; - if (*p == '&') ++p; - else mp_msg(MSGT_ASS, MSGL_DBG2, "suspicious color format: \"%s\"\n", p); + if (*p == '&') + ++p; + else + mp_msg(MSGT_ASS, MSGL_DBG2, "suspicious color format: \"%s\"\n", p); - if (*p == 'H' || *p == 'h') { - ++p; - result = mystrtou32(&p, 16, &color); - } else { - result = mystrtou32(&p, 0, &color); - } + if (*p == 'H' || *p == 'h') { + ++p; + result = mystrtou32(&p, 16, &color); + } else { + result = mystrtou32(&p, 0, &color); + } - { - unsigned char* tmp = (unsigned char*)(&color); - unsigned char b; - b = tmp[0]; tmp[0] = tmp[3]; tmp[3] = b; - b = tmp[1]; tmp[1] = tmp[2]; tmp[2] = b; - } - if (*p == '&') ++p; - *q = p; + { + unsigned char *tmp = (unsigned char *) (&color); + unsigned char b; + b = tmp[0]; + tmp[0] = tmp[3]; + tmp[3] = b; + b = tmp[1]; + tmp[1] = tmp[2]; + tmp[2] = b; + } + if (*p == '&') + ++p; + *q = p; - *res = color; - return result; + *res = color; + return result; } // Return a boolean value for a string -char parse_bool(char* str) { - while (*str == ' ' || *str == '\t') - str++; - if (!strncasecmp(str, "yes", 3)) - return 1; - else if (strtol(str, NULL, 10) > 0) - return 1; - return 0; +char parse_bool(char *str) +{ + while (*str == ' ' || *str == '\t') + str++; + if (!strncasecmp(str, "yes", 3)) + return 1; + else if (strtol(str, NULL, 10) > 0) + return 1; + return 0; } #if 0 -static void sprint_tag(uint32_t tag, char* dst) +static void sprint_tag(uint32_t tag, char *dst) { - dst[0] = (tag >> 24) & 0xFF; - dst[1] = (tag >> 16) & 0xFF; - dst[2] = (tag >> 8) & 0xFF; - dst[3] = tag & 0xFF; - dst[4] = 0; + dst[0] = (tag >> 24) & 0xFF; + dst[1] = (tag >> 16) & 0xFF; + dst[2] = (tag >> 8) & 0xFF; + dst[3] = tag & 0xFF; + dst[4] = 0; } void dump_glyph(FT_Glyph g) { - char tag[5]; - int i; - FT_OutlineGlyph og = (FT_OutlineGlyph)g; - FT_Outline* o = &(og->outline); - sprint_tag(g->format, tag); - printf("glyph: %p \n", g); - printf("format: %s \n", tag); - printf("outline: %p \n", o); - printf("contours: %d, points: %d, points ptr: %p \n", o->n_contours, o->n_points, o->points); - for (i = 0; i < o->n_points; ++i) { - printf(" point %f, %f \n", d6_to_double(o->points[i].x), d6_to_double(o->points[i].y)); - } + char tag[5]; + int i; + FT_OutlineGlyph og = (FT_OutlineGlyph) g; + FT_Outline *o = &(og->outline); + sprint_tag(g->format, tag); + printf("glyph: %p \n", g); + printf("format: %s \n", tag); + printf("outline: %p \n", o); + printf("contours: %d, points: %d, points ptr: %p \n", o->n_contours, + o->n_points, o->points); + for (i = 0; i < o->n_points; ++i) { + printf(" point %f, %f \n", d6_to_double(o->points[i].x), + d6_to_double(o->points[i].y)); + } } #endif |