Changeset 745 for trunk/server/source3/include/safe_string.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/include/safe_string.h (modified) (2 diffs)

trunk/server/source3/include/safe_string.h

@@ -64 +64 @@
 
 #ifdef DEVELOPER
-#define SAFE_STRING_FUNCTION_NAME FUNCTION_MACRO
+#define SAFE_STRING_FUNCTION_NAME __FUNCTION__
 #define SAFE_STRING_LINE __LINE__
 #else
@@ -147 +147 @@
                         inbuf, dest, src, dest_len, src_len, flags)
 
-#define clistr_pull_talloc(ctx, inbuf, pp_dest, src, src_len, flags) \
+#define clistr_pull_talloc(ctx, base, flags2, pp_dest, src, src_len, flags) \
         clistr_pull_talloc_fn(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, \
-                        ctx, inbuf, pp_dest, src, src_len, flags)
+                              ctx, base, flags2, pp_dest, src, src_len, flags)
 
 #define srvstr_push(base_ptr, smb_flags2, dest, src, dest_len, flags) \