svn commit: lorikeet r224 - in trunk/ethereal: .
jelmer at samba.org
jelmer at samba.org
Wed Feb 16 21:41:21 GMT 2005
Author: jelmer
Date: 2005-02-16 21:41:20 +0000 (Wed, 16 Feb 2005)
New Revision: 224
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=224
Log:
Fix ethereal parser generator.
Modified:
trunk/ethereal/Makefile
trunk/ethereal/eparser.c
trunk/ethereal/eparser.h
Changeset:
Modified: trunk/ethereal/Makefile
===================================================================
--- trunk/ethereal/Makefile 2005-02-09 10:32:39 UTC (rev 223)
+++ trunk/ethereal/Makefile 2005-02-16 21:41:20 UTC (rev 224)
@@ -1,6 +1,6 @@
# location of your Samba4 source tree
-SAMBA4=$(HOME)/samba/samba4/source
+SAMBA4=$(HOME)/samba/4.0-cred/source
# where you want your plugins to go
PLUGINS=$(HOME)/.ethereal/plugins
@@ -8,7 +8,7 @@
# list of pidl IDL files to process
MODULES=misc security atsvc lsa samr winreg drsuapi
-CC=ccache gcc
+CC=gcc
# where glib is installed
GLIB=-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
@@ -36,5 +36,8 @@
mkdir -p $(PLUGINS)
cp pidl.so $(PLUGINS)
+ctags:
+ ctags *.c *.h
+
clean:
rm -f *.o *.so *~ packet-dcerpc-*.[ch] ndr_*.[ch]
Modified: trunk/ethereal/eparser.c
===================================================================
--- trunk/ethereal/eparser.c 2005-02-09 10:32:39 UTC (rev 223)
+++ trunk/ethereal/eparser.c 2005-02-16 21:41:20 UTC (rev 224)
@@ -651,7 +651,7 @@
return ndr_token_peek(&ndr->array_size_list, p);
}
-NTSTATUS ndr_pull_relative1(struct pidl_pull *ndr, const void *p, uint32_t rel_offset)
+NTSTATUS ndr_pull_relative_ptr1(struct pidl_pull *ndr, const void *p, uint32_t rel_offset)
{
if (ndr->flags & LIBNDR_FLAG_RELATIVE_CURRENT) {
return ndr_token_store(ndr, &ndr->relative_list, p,
@@ -665,7 +665,7 @@
pull a relative object - stage2
called during BUFFERS processing
*/
-NTSTATUS ndr_pull_relative2(struct pidl_pull *ndr, const void *p)
+NTSTATUS ndr_pull_relative_ptr2(struct pidl_pull *ndr, const void *p)
{
uint32_t rel_offset;
ndr_token_retrieve(&ndr->relative_list, p, &rel_offset);
Modified: trunk/ethereal/eparser.h
===================================================================
--- trunk/ethereal/eparser.h 2005-02-09 10:32:39 UTC (rev 223)
+++ trunk/ethereal/eparser.h 2005-02-16 21:41:20 UTC (rev 224)
@@ -141,8 +141,8 @@
NTSTATUS ndr_pull_array_uint32(struct pidl_pull *ndr, int ndr_flags, pidl_tree *tree, int hf, uint32_t *data, uint32_t n);
NTSTATUS ndr_pull_time_t(struct pidl_pull *ndr, pidl_tree *tree, int hf,
time_t *data);
-NTSTATUS ndr_pull_relative1(struct pidl_pull *ndr, const void *p, uint32_t rel_offset);
-NTSTATUS ndr_pull_relative2(struct pidl_pull *ndr, const void *p);
+NTSTATUS ndr_pull_relative_ptr1(struct pidl_pull *ndr, const void *p, uint32_t rel_offset);
+NTSTATUS ndr_pull_relative_ptr2(struct pidl_pull *ndr, const void *p);
void ndr_pull_save(struct pidl_pull *ndr, struct ndr_pull_save *save);
void ndr_pull_restore(struct pidl_pull *ndr, struct ndr_pull_save *save);
NTSTATUS ndr_pull_subcontext_flags_fn(struct pidl_pull *ndr, pidl_tree *tree,
More information about the samba-cvs
mailing list