diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-02-08 21:08:42 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-02-08 21:08:42 +0000 |
| commit | 61ccbc52ea0e963630688204fcefe28c876ca480 (patch) | |
| tree | 8b7e14713ca36cf0b23f06fb875f0bfa8106e21f /libavutil/base64.c | |
| parent | 94027d3bdd1a4cb7fef47035a67a894ca70e4ab8 (diff) | |
Cosmetics: consistently prefer "size" over "len"/"length" for the
variable names.
Originally committed as revision 17067 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/base64.c')
| -rw-r--r-- | libavutil/base64.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavutil/base64.c b/libavutil/base64.c index 8497a67796..bed5d7e0ca 100644 --- a/libavutil/base64.c +++ b/libavutil/base64.c @@ -42,7 +42,7 @@ static const uint8_t map2[] = 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33 }; -int av_base64_decode(uint8_t * out, const char *in, int out_length) +int av_base64_decode(uint8_t * out, const char *in, int out_size) { int i, v; uint8_t *dst = out; @@ -54,7 +54,7 @@ int av_base64_decode(uint8_t * out, const char *in, int out_length) return -1; v = (v << 6) + map2[index]; if (i & 3) { - if (dst - out < out_length) { + if (dst - out < out_size) { *dst++ = v >> (6 - 2 * (i & 3)); } } @@ -69,17 +69,17 @@ int av_base64_decode(uint8_t * out, const char *in, int out_length) * Fixed edge cases and made it work from data (vs. strings) by Ryan. *****************************************************************************/ -char *av_base64_encode(char * buf, int buf_len, const uint8_t * src, int len) +char *av_base64_encode(char * buf, int buf_size, const uint8_t * src, int size) { static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; char *ret, *dst; unsigned i_bits = 0; int i_shift = 0; - int bytes_remaining = len; + int bytes_remaining = size; - if (len >= UINT_MAX / 4 || - buf_len < (len+2) / 3 * 4 + 1) + if (size >= UINT_MAX / 4 || + buf_size < (size+2) / 3 * 4 + 1) return NULL; ret = dst = buf; while (bytes_remaining) { |