virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Cosmetics: consistently prefer "size" over "len"/"length" for the

Browse Source 
variable names.

Originally committed as revision 17067 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2009-02-08 21:08:42 +00:00
parent 94027d3bdd
commit 61ccbc52ea
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavutil/base64.c
View File

@ -42,7 +42,7 @@ static const uint8_t map2[] =
0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33 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; int i, v;
uint8_t *dst = out; uint8_t *dst = out;
@ -54,7 +54,7 @@ int av_base64_decode(uint8_t * out, const char *in, int out_length)
return -1; return -1;
v = (v << 6) + map2[index]; v = (v << 6) + map2[index];
if (i & 3) { if (i & 3) {
if (dst - out < out_length) { if (dst - out < out_size) {
*dst++ = v >> (6 - 2 * (i & 3)); *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. * 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[] = static const char b64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
char *ret, *dst; char *ret, *dst;
unsigned i_bits = 0; unsigned i_bits = 0;
int i_shift = 0; int i_shift = 0;
int bytes_remaining = len; int bytes_remaining = size;
if (len >= UINT_MAX / 4 || if (size >= UINT_MAX / 4 ||
buf_len < (len+2) / 3 * 4 + 1) buf_size < (size+2) / 3 * 4 + 1)
return NULL; return NULL;
ret = dst = buf; ret = dst = buf;
while (bytes_remaining) { while (bytes_remaining) {

4
libavutil/base64.h
View File

@ -27,13 +27,13 @@
* Decodes Base64. * Decodes Base64.
* Parameter order is the same as strncpy(). * Parameter order is the same as strncpy().
*/ */
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);
/** /**
* Encodes Base64. * Encodes Base64.
* @param src data, not a string * @param src data, not a string
* @param buf output string * @param buf output string
*/ */
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);
#endif /* AVUTIL_BASE64_H */ #endif /* AVUTIL_BASE64_H */