[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] HG: xine-lib-1.2: Rename base64 functions to _x_ as they
From:       "=?UTF-8?Q?Diego=20'Flameeyes'=20Petten=C3=B2?=" <flameeyes () gmail ! com>
Date:       2008-01-27 13:00:21
Message-ID: 53f76c5cd6435891b0dd.1201438711 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
# Date 1201438711 -3600
# Node ID 53f76c5cd6435891b0ddfe6edc775fa4553b85c5
# Parent  f60ea1004df1e7054f72a8f6d9c94bed90bb5662
Rename base64 functions to _x_ as they should not be part of the public API.
Note that these will be removed as soon as -libavutil branch is merged, in favour of \
libavutil's base64 implementation.

diff -r 53f76c5cd6435891b0ddfe6edc775fa4553b85c5 -r \
                f60ea1004df1e7054f72a8f6d9c94bed90bb5662 src/input/input_cdda.c
--- a/src/input/input_cdda.c	Sun Jan 27 13:58:31 2008 +0100
+++ b/src/input/input_cdda.c	Sun Jan 27 13:54:38 2008 +0100
@@ -1936,7 +1936,7 @@ static void _cdda_cdindex(cdda_input_plu
 
   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 -r 53f76c5cd6435891b0ddfe6edc775fa4553b85c5 -r \
                f60ea1004df1e7054f72a8f6d9c94bed90bb5662 src/xine-engine/configfile.c
--- a/src/xine-engine/configfile.c	Sun Jan 27 13:58:31 2008 +0100
+++ b/src/xine-engine/configfile.c	Sun Jan 27 13:54:38 2008 +0100
@@ -1342,7 +1342,7 @@ static char* config_get_serialized_entry
     }
 
     /* 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_
   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 -r 53f76c5cd6435891b0ddfe6edc775fa4553b85c5 -r \
                f60ea1004df1e7054f72a8f6d9c94bed90bb5662 src/xine-utils/base64.c
--- a/src/xine-utils/base64.c	Sun Jan 27 13:58:31 2008 +0100
+++ b/src/xine-utils/base64.c	Sun Jan 27 13:54:38 2008 +0100
@@ -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 
   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 *sr
   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 -r 53f76c5cd6435891b0ddfe6edc775fa4553b85c5 -r \
                f60ea1004df1e7054f72a8f6d9c94bed90bb5662 src/xine-utils/base64.h
--- a/src/xine-utils/base64.h	Sun Jan 27 13:58:31 2008 +0100
+++ b/src/xine-utils/base64.h	Sun Jan 27 13:54:38 2008 +0100
@@ -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

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]