Merge from HEAD:

[samba.git] / source / rpc_parse / parse_misc.c

diff --git a/source/rpc_parse/parse_misc.c b/source/rpc_parse/parse_misc.c
index 43d26a691d02f3fb9988f3b87bbaa115c8e34c26..f0d4c67d9f4cec5a8b45f8a521f646d51ac21e6c 100644 (file)
--- a/source/rpc_parse/parse_misc.c
+++ b/source/rpc_parse/parse_misc.c
@@ -697,7 +697,7 @@ BOOL smb_io_buffer5(const char *desc, BUFFER5 *buf5, prs_struct *ps, int depth)
  Inits a BUFFER2 structure.
 ********************************************************************/
 
-void init_buffer2(BUFFER2 *str, const uint8 *buf, int len)
+void init_buffer2(BUFFER2 *str, const uint8 *buf, size_t len)
 {
        ZERO_STRUCTP(str);
 
@@ -1050,7 +1050,7 @@ BOOL smb_io_unistr2(const char *desc, UNISTR2 *uni2, uint32 buffer, prs_struct *
 BOOL init_unistr2_array(UNISTR2_ARRAY *array, 
                       uint32 count, const char **strings)
 {
-       int i;
+       unsigned int i;
 
        array->count = count;
        array->ref_id = count?1:0;
@@ -1078,7 +1078,7 @@ BOOL init_unistr2_array(UNISTR2_ARRAY *array,
 ********************************************************************/
 BOOL smb_io_unistr2_array(const char *desc, UNISTR2_ARRAY *array, prs_struct *ps, int depth)
 {
-       int i;
+       unsigned int i;
 
        prs_debug(ps, depth, desc, "smb_io_unistr2_array");
        depth++;