svn commit: samba r14889 - branches/SAMBA_3_0/source/smbwrapper trunk/source/smbwrapper

vlendec at samba.org vlendec at samba.org
Mon Apr 3 13:53:57 GMT 2006


Author: vlendec
Date: 2006-04-03 13:53:57 +0000 (Mon, 03 Apr 2006)
New Revision: 14889

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

Log:
Fix smbwrapper compile
Modified:
   branches/SAMBA_3_0/source/smbwrapper/shared.c
   branches/SAMBA_3_0/source/smbwrapper/smbw_dir.c
   trunk/source/smbwrapper/shared.c
   trunk/source/smbwrapper/smbw_dir.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbwrapper/shared.c
===================================================================
--- branches/SAMBA_3_0/source/smbwrapper/shared.c	2006-04-03 12:04:37 UTC (rev 14888)
+++ branches/SAMBA_3_0/source/smbwrapper/shared.c	2006-04-03 13:53:57 UTC (rev 14889)
@@ -111,7 +111,7 @@
 	if (fstat(shared_fd, &st)) goto failed;
 
 	if (st.st_size != shared_size) {
-		var = (char *)Realloc(variables, st.st_size);
+		var = (char *)Realloc(variables, st.st_size, True);
 		if (!var) goto failed;
 		else variables = var;
 		shared_size = st.st_size;
@@ -167,7 +167,7 @@
 	l1 = strlen(name)+1;
 	l2 = strlen(val)+1;
 
-	var = (char *)Realloc(variables, shared_size + l1+l2+4);
+	var = (char *)Realloc(variables, shared_size + l1+l2+4, True);
 
 	if (!var) {
 		DEBUG(0,("out of memory in smbw_setshared\n"));

Modified: branches/SAMBA_3_0/source/smbwrapper/smbw_dir.c
===================================================================
--- branches/SAMBA_3_0/source/smbwrapper/smbw_dir.c	2006-04-03 12:04:37 UTC (rev 14888)
+++ branches/SAMBA_3_0/source/smbwrapper/smbw_dir.c	2006-04-03 13:53:57 UTC (rev 14889)
@@ -85,7 +85,7 @@
 	if (cur_dir->malloced == cur_dir->count) {
 		cdl = (struct file_info *)Realloc(cur_dir->list, 
 							    sizeof(cur_dir->list[0])*
-							    (cur_dir->count+100));
+							    (cur_dir->count+100), True);
 		if (!cdl) {
 			/* oops */
 			return;

Modified: trunk/source/smbwrapper/shared.c
===================================================================
--- trunk/source/smbwrapper/shared.c	2006-04-03 12:04:37 UTC (rev 14888)
+++ trunk/source/smbwrapper/shared.c	2006-04-03 13:53:57 UTC (rev 14889)
@@ -111,7 +111,7 @@
 	if (fstat(shared_fd, &st)) goto failed;
 
 	if (st.st_size != shared_size) {
-		var = (char *)Realloc(variables, st.st_size);
+		var = (char *)Realloc(variables, st.st_size, True);
 		if (!var) goto failed;
 		else variables = var;
 		shared_size = st.st_size;
@@ -167,7 +167,7 @@
 	l1 = strlen(name)+1;
 	l2 = strlen(val)+1;
 
-	var = (char *)Realloc(variables, shared_size + l1+l2+4);
+	var = (char *)Realloc(variables, shared_size + l1+l2+4, True);
 
 	if (!var) {
 		DEBUG(0,("out of memory in smbw_setshared\n"));

Modified: trunk/source/smbwrapper/smbw_dir.c
===================================================================
--- trunk/source/smbwrapper/smbw_dir.c	2006-04-03 12:04:37 UTC (rev 14888)
+++ trunk/source/smbwrapper/smbw_dir.c	2006-04-03 13:53:57 UTC (rev 14889)
@@ -85,7 +85,7 @@
 	if (cur_dir->malloced == cur_dir->count) {
 		cdl = (struct file_info *)Realloc(cur_dir->list, 
 							    sizeof(cur_dir->list[0])*
-							    (cur_dir->count+100));
+							    (cur_dir->count+100), True);
 		if (!cdl) {
 			/* oops */
 			return;



More information about the samba-cvs mailing list