r4088: Get medieval on our ass about malloc.... :-). Take control of all our allocation

[abartlet/samba.git/.git] / source3 / include / smb.h

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 32dba0cf78f02a3aa0b59d9e249c1466e7ba6172..49d3d29ac03ad827a9e9dcb66555a49c950a8110 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -53,9 +53,6 @@ typedef int BOOL;
 #define _BOOL       /* So we don't typedef BOOL again in vfs.h */
 #endif
 
-/* limiting size of ipc replies */
-#define REALLOC(ptr,size) Realloc(ptr,MAX((size),4*1024))
-
 #define SIZEOFWORD 2
 
 #ifndef DEF_CREATE_MASK
@@ -380,8 +377,7 @@ typedef struct
 
 #include "fake_file.h"
 
-typedef struct files_struct
-{
+typedef struct files_struct {
        struct files_struct *next, *prev;
        int fnum;
        struct connection_struct *conn;
@@ -1657,12 +1653,12 @@ struct unix_error_map {
 #define SAFE_NETBIOS_CHARS ". -_"
 
 /* generic iconv conversion structure */
-typedef struct {
-       size_t (*direct)(void *cd, char **inbuf, size_t *inbytesleft,
+typedef struct _smb_iconv_t {
+       size_t (*direct)(void *cd, const char **inbuf, size_t *inbytesleft,
                         char **outbuf, size_t *outbytesleft);
-       size_t (*pull)(void *cd, char **inbuf, size_t *inbytesleft,
+       size_t (*pull)(void *cd, const char **inbuf, size_t *inbytesleft,
                       char **outbuf, size_t *outbytesleft);
-       size_t (*push)(void *cd, char **inbuf, size_t *inbytesleft,
+       size_t (*push)(void *cd, const char **inbuf, size_t *inbytesleft,
                       char **outbuf, size_t *outbytesleft);
        void *cd_direct, *cd_pull, *cd_push;
        char *from_name, *to_name;