svn commit: samba r22543 - in branches: SAMBA_3_0/source/include SAMBA_3_0_25/source/include

jra at samba.org jra at samba.org
Sat Apr 28 02:51:55 GMT 2007


Author: jra
Date: 2007-04-28 02:51:55 +0000 (Sat, 28 Apr 2007)
New Revision: 22543

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22543

Log:
Fix bad call to talloc_strict (too few args).
Should fix build farm breakage.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/include/smb_macros.h
   branches/SAMBA_3_0_25/source/include/smb_macros.h


Changeset:
Modified: branches/SAMBA_3_0/source/include/smb_macros.h
===================================================================
--- branches/SAMBA_3_0/source/include/smb_macros.h	2007-04-27 23:18:41 UTC (rev 22542)
+++ branches/SAMBA_3_0/source/include/smb_macros.h	2007-04-28 02:51:55 UTC (rev 22543)
@@ -282,7 +282,7 @@
 #define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type *)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type)
 #define talloc_destroy(ctx) talloc_free(ctx)
 #define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} } while(0)
-#define TALLOC_SIZE(ctx, size) talloc_strict(ctx, size)
+#define TALLOC_SIZE(ctx, size) talloc_strict(ctx, size, __location__)
 #define TALLOC_ZERO_SIZE(ctx, size) talloc_zero_size_strict(ctx, size)
 
 /* only define PARANOID_MALLOC_CHECKER with --enable-developer and not compiling

Modified: branches/SAMBA_3_0_25/source/include/smb_macros.h
===================================================================
--- branches/SAMBA_3_0_25/source/include/smb_macros.h	2007-04-27 23:18:41 UTC (rev 22542)
+++ branches/SAMBA_3_0_25/source/include/smb_macros.h	2007-04-28 02:51:55 UTC (rev 22543)
@@ -282,7 +282,7 @@
 #define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type *)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type)
 #define talloc_destroy(ctx) talloc_free(ctx)
 #define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} } while(0)
-#define TALLOC_SIZE(ctx, size) talloc_strict(ctx, size)
+#define TALLOC_SIZE(ctx, size) talloc_strict(ctx, size, __location__)
 #define TALLOC_ZERO_SIZE(ctx, size) talloc_zero_size_strict(ctx, size)
 
 /* only define PARANOID_MALLOC_CHECKER with --enable-developer and not compiling



More information about the samba-cvs mailing list