svn commit: lorikeet r217 - in trunk/ethereal: .

[tridge at samba.org]

Author: tridge
Date: 2005-01-27 07:12:58 +0000 (Thu, 27 Jan 2005)
New Revision: 217

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

Log:
get rid of TALLOC_DEPRECATED
Modified:
   trunk/ethereal/Makefile
   trunk/ethereal/eparser.c


Changeset:
Modified: trunk/ethereal/Makefile
===================================================================
--- trunk/ethereal/Makefile	2005-01-27 06:32:36 UTC (rev 216)
+++ trunk/ethereal/Makefile	2005-01-27 07:12:58 UTC (rev 217)
@@ -14,7 +14,7 @@
 GLIB=-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
 
 
-CFLAGS=-DHAVE_CONFIG_H -Iethereal_headers -I. $(GLIB) -DTALLOC_DEPRECATED -DINET6 "-D_U_=__attribute__((unused))" -Wall -W -g -O2 -DXTHREADS -pthread -fPIC
+CFLAGS=-DHAVE_CONFIG_H -Iethereal_headers -I. $(GLIB) -DINET6 "-D_U_=__attribute__((unused))" -Wall -W -g -O2 -DXTHREADS -pthread -fPIC
 
 OBJS_MODULES=$(MODULES:%=packet-dcerpc-%.o)
 C_MODULES=$(MODULES:%=packet-dcerpc-%.c)
@@ -37,4 +37,4 @@
 	cp pidl.so $(PLUGINS)
 
 clean:
-	rm -f *.o *.so *~ packet-dcerpc-*.[ch]
+	rm -f *.o *.so *~ packet-dcerpc-*.[ch] ndr_*.[ch]

Modified: trunk/ethereal/eparser.c
===================================================================
--- trunk/ethereal/eparser.c	2005-01-27 06:32:36 UTC (rev 216)
+++ trunk/ethereal/eparser.c	2005-01-27 07:12:58 UTC (rev 217)
@@ -10,7 +10,7 @@
 {
 	struct pidl_pull *ndr;
 
-	ndr = (struct pidl_pull *)talloc_p(NULL, struct pidl_pull);
+	ndr = (struct pidl_pull *)talloc(NULL, struct pidl_pull);
 	
 	ndr->tvb = tvb_new_subset(tvb, offset, -1, -1);
 	ndr->offset = 0;
@@ -211,7 +211,7 @@
 				uint32_t value)
 {
 	struct ndr_token_list *tok;
-	tok = talloc_p(mem_ctx, struct ndr_token_list);
+	tok = talloc(mem_ctx, struct ndr_token_list);
 	if (tok == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}