Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/base85.c b/base85.c
index a9e97f89d9beb51ffd7c8f0be828b8c85358a1ef..a6c41d597ab8eccb5eb2ccf2b3b543398c360b44 100644 (file)
--- a/base85.c
+++ b/base85.c
@@ -37,7 +37,7 @@ static void prep_base85(void)
        }
 }
 
-int decode_85(char *dst, char *buffer, int len)
+int decode_85(char *dst, const char *buffer, int len)
 {
        prep_base85();
 
@@ -82,7 +82,7 @@ int decode_85(char *dst, char *buffer, int len)
        return 0;
 }
 
-void encode_85(char *buf, unsigned char *data, int bytes)
+void encode_85(char *buf, const unsigned char *data, int bytes)
 {
        prep_base85();