[FFmpeg-devel] [PATCH 1/2] Cosmetics: add do {} while 0 to macro.
Reimar Döffinger
Reimar.Doeffinger at gmx.de
Sat Jan 21 22:56:33 CET 2012
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
---
libavutil/base64.c | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/libavutil/base64.c b/libavutil/base64.c
index df0f6a3..145bed6 100644
--- a/libavutil/base64.c
+++ b/libavutil/base64.c
@@ -68,13 +68,14 @@ static const uint8_t map2[256] =
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
};
-#define BASE64_DEC_STEP(i) \
+#define BASE64_DEC_STEP(i) do { \
bits = map2[in[i]]; \
if (bits & 0x80) \
goto out; \
v = (v << 6) + bits; \
if (i & 3) \
*dst++ = v >> (6 - 2 * (i & 3)); \
+} while(0)
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;
while (end - dst > 2) {
- BASE64_DEC_STEP(0)
- BASE64_DEC_STEP(1)
- BASE64_DEC_STEP(2)
- BASE64_DEC_STEP(3)
+ BASE64_DEC_STEP(0);
+ BASE64_DEC_STEP(1);
+ BASE64_DEC_STEP(2);
+ BASE64_DEC_STEP(3);
in += 4;
}
if (end - dst) {
- BASE64_DEC_STEP(0)
- BASE64_DEC_STEP(1)
+ BASE64_DEC_STEP(0);
+ BASE64_DEC_STEP(1);
if (end - dst) {
- BASE64_DEC_STEP(2)
+ BASE64_DEC_STEP(2);
in++;
}
in += 2;
}
while (1) {
- BASE64_DEC_STEP(0)
+ BASE64_DEC_STEP(0);
in++;
- BASE64_DEC_STEP(0)
+ BASE64_DEC_STEP(0);
in++;
- BASE64_DEC_STEP(0)
+ BASE64_DEC_STEP(0);
in++;
- BASE64_DEC_STEP(0)
+ BASE64_DEC_STEP(0);
in++;
}
--
1.7.8.3
More information about the ffmpeg-devel
mailing list