Remove unused argument iconv_convenience.

[amitay/samba.git] / source4 / auth / ntlmssp / ntlmssp_parse.c

diff --git a/source4/auth/ntlmssp/ntlmssp_parse.c b/source4/auth/ntlmssp/ntlmssp_parse.c
index bb2d7a14a8039d5e9211c14dd4878aa5815ba797..d606b8d563e022ef01da0bdc9bdcb2ce01f1789f 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_parse.c
+++ b/source4/auth/ntlmssp/ntlmssp_parse.c
@@ -20,8 +20,7 @@
 */
 
 #include "includes.h"
-#include "pstring.h"
-#include "param/param.h"
+#include "auth/ntlmssp/msrpc_parse.h"
 
 /*
   this is a tiny msrpc packet generator. I am only using this to
@@ -41,7 +40,8 @@
   d = word (4 bytes)
   C = constant ascii string
  */
-bool msrpc_gen(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
+bool msrpc_gen(TALLOC_CTX *mem_ctx, 
+              DATA_BLOB *blob,
               const char *format, ...)
 {
        int i;
@@ -65,7 +65,7 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
                case 'U':
                        s = va_arg(ap, char *);
                        head_size += 8;
-                       n = push_ucs2_talloc(pointers, lp_iconv_convenience(global_loadparm), (void **)&pointers[i].data, s);
+                       n = push_ucs2_talloc(pointers, (void **)&pointers[i].data, s);
                        if (n == -1) {
                                return false;
                        }
@@ -76,7 +76,7 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
                case 'A':
                        s = va_arg(ap, char *);
                        head_size += 8;
-                       n = push_ascii_talloc(pointers, lp_iconv_convenience(global_loadparm), (char **)&pointers[i].data, s);
+                       n = push_ascii_talloc(pointers, (char **)&pointers[i].data, s);
                        if (n == -1) {
                                return false;
                        }
@@ -88,7 +88,7 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
                        n = va_arg(ap, int);
                        intargs[i] = n;
                        s = va_arg(ap, char *);
-                       n = push_ucs2_talloc(pointers, lp_iconv_convenience(global_loadparm), (void **)&pointers[i].data, s);
+                       n = push_ucs2_talloc(pointers, (void **)&pointers[i].data, s);
                        if (n == -1) {
                                return false;
                        }
@@ -186,7 +186,7 @@ if ((head_ofs + amount) > blob->length) { \
         return false; \
 }
 
-/*
+/**
   this is a tiny msrpc packet parser. This the the partner of msrpc_gen
 
   format specifiers are:
@@ -199,7 +199,8 @@ if ((head_ofs + amount) > blob->length) { \
   C = constant ascii string
  */
 
-bool msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob,
+bool msrpc_parse(TALLOC_CTX *mem_ctx, 
+                const DATA_BLOB *blob,
                 const char *format, ...)
 {
        int i;
@@ -237,14 +238,14 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob,
                                        ret = false;
                                        goto cleanup;
                                }
-                               if (blob->data + ptr < (uint8_t *)ptr ||
+                               if (blob->data + ptr < (uint8_t *)(uintptr_t)ptr ||
                                                blob->data + ptr < blob->data) {
                                        ret = false;
                                        goto cleanup;
                                }
 
                                if (0 < len1) {
-                                       pull_string(lp_iconv_convenience(global_loadparm), p, blob->data + ptr, p_len, 
+                                       pull_string(p, blob->data + ptr, p_len, 
                                                    len1, STR_UNICODE|STR_NOALIGN);
                                        (*ps) = talloc_strdup(mem_ctx, p);
                                        if (!(*ps)) {
@@ -272,14 +273,14 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob,
                                        goto cleanup;
                                }
 
-                               if (blob->data + ptr < (uint8_t *)ptr ||
+                               if (blob->data + ptr < (uint8_t *)(uintptr_t)ptr ||
                                                blob->data + ptr < blob->data) {
                                        ret = false;
                                        goto cleanup;
                                }
 
                                if (0 < len1) {
-                                       pull_string(lp_iconv_convenience(global_loadparm), p, blob->data + ptr, p_len, 
+                                       pull_string(p, blob->data + ptr, p_len, 
                                                    len1, STR_ASCII|STR_NOALIGN);
                                        (*ps) = talloc_strdup(mem_ctx, p);
                                        if (!(*ps)) {
@@ -307,7 +308,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob,
                                        goto cleanup;
                                }
 
-                               if (blob->data + ptr < (uint8_t *)ptr ||
+                               if (blob->data + ptr < (uint8_t *)(uintptr_t)ptr ||
                                                blob->data + ptr < blob->data) {
                                        ret = false;
                                        goto cleanup;
@@ -344,7 +345,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob,
                                goto cleanup;
                        }
 
-                       head_ofs += pull_string(lp_iconv_convenience(global_loadparm), p,
+                       head_ofs += pull_string(p,
                                        blob->data+head_ofs, p_len,
                                        blob->length - head_ofs,
                                        STR_ASCII|STR_TERMINATE);