generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cosmetics: add do {} while 0 to macro.

Browse Source 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2012-01-21 22:48:15 +01:00
parent 0421b6dc7a
commit 420719e141
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavutil/base64.c
View File

@ -68,13 +68,14 @@ static const uint8_t map2[256] =
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
}; };
#define BASE64_DEC_STEP(i) \ #define BASE64_DEC_STEP(i) do { \
bits = map2[in[i]]; \ bits = map2[in[i]]; \
if (bits & 0x80) \ if (bits & 0x80) \
goto out; \ goto out; \
v = (v << 6) + bits; \ v = (v << 6) + bits; \
if (i & 3) \ if (i & 3) \
*dst++ = v >> (6 - 2 * (i & 3)); \ *dst++ = v >> (6 - 2 * (i & 3)); \
} while(0)
int av_base64_decode(uint8_t *out, const char *in_str, int out_size) int av_base64_decode(uint8_t *out, const char *in_str, int out_size)
{ {
@ -87,29 +88,29 @@ int av_base64_decode(uint8_t *out, const char *in_str, int out_size)
v = 0; v = 0;
while (end - dst > 2) { while (end - dst > 2) {
BASE64_DEC_STEP(0) BASE64_DEC_STEP(0);
BASE64_DEC_STEP(1) BASE64_DEC_STEP(1);
BASE64_DEC_STEP(2) BASE64_DEC_STEP(2);
BASE64_DEC_STEP(3) BASE64_DEC_STEP(3);
in += 4; in += 4;
} }
if (end - dst) { if (end - dst) {
BASE64_DEC_STEP(0) BASE64_DEC_STEP(0);
BASE64_DEC_STEP(1) BASE64_DEC_STEP(1);
if (end - dst) { if (end - dst) {
BASE64_DEC_STEP(2) BASE64_DEC_STEP(2);
in++; in++;
} }
in += 2; in += 2;
} }
while (1) { while (1) {
BASE64_DEC_STEP(0) BASE64_DEC_STEP(0);
in++; in++;
BASE64_DEC_STEP(0) BASE64_DEC_STEP(0);
in++; in++;
BASE64_DEC_STEP(0) BASE64_DEC_STEP(0);
in++; in++;
BASE64_DEC_STEP(0) BASE64_DEC_STEP(0);
in++; in++;
} }