diff options
| -rw-r--r-- | src/input/input_cdda.c | 2 | ||||
| -rw-r--r-- | src/xine-engine/configfile.c | 4 | ||||
| -rw-r--r-- | src/xine-utils/base64.c | 6 | ||||
| -rw-r--r-- | src/xine-utils/base64.h | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index e2c32d509..64495c433 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -1936,7 +1936,7 @@ static void _cdda_cdindex(cdda_input_plugin_t *this, cdrom_toc *toc) { sha_final(digest, &sha); - base64 = xine_rfc822_binary(digest, 20, &size); + base64 = _x_rfc822_binary(digest, 20, &size); base64[size] = 0; _x_meta_info_set_utf8(this->stream, XINE_META_INFO_CDINDEX_DISCID, base64); diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 8ac0e7eb3..37a4e38ad 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -1342,7 +1342,7 @@ static char* config_get_serialized_entry (config_values_t *this, const char *key } /* and now the output encoding */ - output = xine_base64_encode (buffer, total_len, &output_len); + output = _x_base64_encode (buffer, total_len, &output_len); free(buffer); } @@ -1414,7 +1414,7 @@ static char* config_register_serialized_entry (config_values_t *this, const char int value_count = 0; int i; - output = xine_base64_decode (value, strlen(value), &output_len); + output = _x_base64_decode (value, strlen(value), &output_len); pos = 0; pos += bytes = get_int(output, output_len, pos, &type); diff --git a/src/xine-utils/base64.c b/src/xine-utils/base64.c index 583723cdc..5730f30db 100644 --- a/src/xine-utils/base64.c +++ b/src/xine-utils/base64.c @@ -107,7 +107,7 @@ * Returns: destination as BASE64 */ -unsigned char *xine_rfc822_binary (void *src,unsigned long srcl,unsigned long *len) +unsigned char *_x_rfc822_binary (void *src,unsigned long srcl,unsigned long *len) { unsigned char *ret,*d; unsigned char *s = (unsigned char *) src; @@ -134,7 +134,7 @@ unsigned char *xine_rfc822_binary (void *src,unsigned long srcl,unsigned long *l return ret; /* return the resulting string */ } -char *xine_base64_encode (const void *src, unsigned long srcl, unsigned long *len) +char *_x_base64_encode (const void *src, unsigned long srcl, unsigned long *len) { char *ret, *d; unsigned char *s = (unsigned char *) src; @@ -157,7 +157,7 @@ char *xine_base64_encode (const void *src, unsigned long srcl, unsigned long *le return ret; /* return the resulting string */ } -void *xine_base64_decode (const char *src, unsigned long srcl, unsigned long *len) +void *_x_base64_decode (const char *src, unsigned long srcl, unsigned long *len) { void *ret; unsigned char *d; diff --git a/src/xine-utils/base64.h b/src/xine-utils/base64.h index 61d362150..f22f9b0c4 100644 --- a/src/xine-utils/base64.h +++ b/src/xine-utils/base64.h @@ -86,9 +86,9 @@ #ifndef BASE64_H #define BASE64_H -unsigned char *xine_rfc822_binary (void *src,unsigned long srcl,unsigned long *len) XINE_PROTECTED; +unsigned char *_x_rfc822_binary (void *src,unsigned long srcl,unsigned long *len) XINE_PROTECTED; -char *xine_base64_encode (const void *src, unsigned long srcl, unsigned long *len) XINE_PROTECTED; -void *xine_base64_decode (const char *src, unsigned long srcl, unsigned long *len) XINE_PROTECTED; +char *_x_base64_encode (const void *src, unsigned long srcl, unsigned long *len) XINE_PROTECTED; +void *_x_base64_decode (const char *src, unsigned long srcl, unsigned long *len) XINE_PROTECTED; #endif |