From 4333df63551c1dcb170c55771295db5b114dfc67 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Thu, 24 Jan 2013 19:00:57 +0100 Subject: avstring: K&R formatting cosmetics Signed-off-by: Diego Biurrun --- libavutil/avstring.c | 115 +++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 59 deletions(-) diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 2c88bd3d5b..a16adcb3fe 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -24,10 +24,11 @@ #include #include #include -#include "avstring.h" + #include "config.h" #include "common.h" #include "mem.h" +#include "avstring.h" int av_strstart(const char *str, const char *pfx, const char **ptr) { @@ -56,10 +57,10 @@ char *av_stristr(const char *s1, const char *s2) if (!*s2) return s1; - do { + do if (av_stristart(s1, s2, NULL)) return s1; - } while (*s1++); + while (*s1++); return NULL; } @@ -96,8 +97,9 @@ size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...) char *av_d2str(double d) { - char *str= av_malloc(16); - if(str) snprintf(str, 16, "%f", d); + char *str = av_malloc(16); + if (str) + snprintf(str, 16, "%f", d); return str; } @@ -105,32 +107,33 @@ char *av_d2str(double d) char *av_get_token(const char **buf, const char *term) { - char *out = av_malloc(strlen(*buf) + 1); - char *ret= out, *end= out; + char *out = av_malloc(strlen(*buf) + 1); + char *ret = out, *end = out; const char *p = *buf; - if (!out) return NULL; + if (!out) + return NULL; p += strspn(p, WHITESPACES); - while(*p && !strspn(p, term)) { + while (*p && !strspn(p, term)) { char c = *p++; - if(c == '\\' && *p){ + if (c == '\\' && *p) { *out++ = *p++; - end= out; - }else if(c == '\''){ - while(*p && *p != '\'') + end = out; + } else if (c == '\'') { + while (*p && *p != '\'') *out++ = *p++; - if(*p){ + if (*p) { p++; - end= out; + end = out; } - }else{ + } else { *out++ = c; } } - do{ + do *out-- = 0; - }while(out >= end && strspn(out, WHITESPACES)); + while (out >= end && strspn(out, WHITESPACES)); *buf = p; @@ -196,54 +199,48 @@ const char *av_dirname(char *path) return path; } - #ifdef TEST -#include "common.h" - int main(void) { int i; + const char *strings[] = { + "''", + "", + ":", + "\\", + "'", + " '' :", + " '' '' :", + "foo '' :", + "'foo'", + "foo ", + " ' foo ' ", + "foo\\", + "foo': blah:blah", + "foo\\: blah:blah", + "foo\'", + "'foo : ' :blahblah", + "\\ :blah", + " foo", + " foo ", + " foo \\ ", + "foo ':blah", + " foo bar : blahblah", + "\\f\\o\\o", + "'foo : \\ \\ ' : blahblah", + "'\\fo\\o:': blahblah", + "\\'fo\\o\\:': foo ' :blahblah" + }; printf("Testing av_get_token()\n"); - { - const char *strings[] = { - "''", - "", - ":", - "\\", - "'", - " '' :", - " '' '' :", - "foo '' :", - "'foo'", - "foo ", - " ' foo ' ", - "foo\\", - "foo': blah:blah", - "foo\\: blah:blah", - "foo\'", - "'foo : ' :blahblah", - "\\ :blah", - " foo", - " foo ", - " foo \\ ", - "foo ':blah", - " foo bar : blahblah", - "\\f\\o\\o", - "'foo : \\ \\ ' : blahblah", - "'\\fo\\o:': blahblah", - "\\'fo\\o\\:': foo ' :blahblah" - }; - - for (i=0; i < FF_ARRAY_ELEMS(strings); i++) { - const char *p = strings[i], *q; - printf("|%s|", p); - q = av_get_token(&p, ":"); - printf(" -> |%s|", q); - printf(" + |%s|\n", p); - av_free(q); - } + for (i = 0; i < FF_ARRAY_ELEMS(strings); i++) { + const char *p = strings[i], *q; + printf("|%s|", p); + q = av_get_token(&p, ":"); + printf(" -> |%s|", q); + printf(" + |%s|\n", p); + av_free(q); } return 0; -- cgit v1.2.3 From 33552a5f7b6ec7057516f487b1a902331f8c353e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 21 Jan 2013 10:16:03 +0100 Subject: arm: Add mathops.h to ARCH_HEADERS list It is an arch-specific header not suitable for standalone compilation. --- libavcodec/arm/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index b8d78d67d6..0c372a428a 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -1,3 +1,5 @@ +ARCH_HEADERS = mathops.h + OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o \ arm/ac3dsp_arm.o -- cgit v1.2.3