genparse stuff
Stefan (metze) Metzmacher
metze at metzemix.de
Tue Dec 17 05:50:45 EST 2002
Hi Simo,
here's a possible fix...
there's a new problem now.
include/proto.h:354: warning: `struct parse_string' declared inside
parameter list
did you forgot a genparse.h ????
metze
-----------------------------------------------------------------------------
Stefan "metze" Metzmacher <metze at metzemix.de>
-------------- next part --------------
diff -Npur --exclude=CVS --exclude=*.bak --exclude=*.o --exclude=*.po --exclude=*.so --exclude=.#* --exclude=Makefile --exclude=stamp-h --exclude=configure --exclude=findsmb --exclude=*proto*.h --exclude=build_env.h --exclude=config.* --exclude=bin --exclude=*.configure HEAD/source/include/genparser.h HEAD-modules/source/include/genparser.h
--- HEAD/source/include/genparser.h Thu Jan 1 01:00:00 1970
+++ HEAD-modules/source/include/genparser.h Mon Dec 16 19:35:12 2002
@@ -0,0 +1,80 @@
+/*
+ Copyright (C) Andrew Tridgell <genstruct at tridgell.net> 2002
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+
+#ifndef _GENSTRUCT_H
+#define _GENSTRUCT_H
+/* these macros are needed for genstruct auto-parsers */
+#define _LEN(x)
+#define _NULLTERM
+
+
+/*
+ automatic marshalling/unmarshalling system for C structures
+*/
+
+enum parse_type {T_INT, T_UNSIGNED, T_CHAR,
+ T_FLOAT, T_DOUBLE, T_ENUM, T_STRUCT,
+ T_TIME_T, T_LONG, T_ULONG};
+
+/* flag to mark a fixed size array as actually being null terminated */
+#define FLAG_NULLTERM 1
+#define FLAG_ALWAYS 2
+
+struct enum_struct {
+ const char *name;
+ unsigned value;
+};
+
+/* intermediate dumps are stored in one of these */
+struct parse_string {
+ unsigned allocated;
+ unsigned length;
+ char *s;
+};
+
+typedef int (*gen_dump_fn)(struct parse_string *, const char *ptr, unsigned indent);
+typedef int (*gen_parse_fn)(char *ptr, const char *str);
+
+/* genstruct.pl generates arrays of these */
+struct parse_struct {
+ const char *name;
+ unsigned ptr_count;
+ unsigned size;
+ unsigned offset;
+ unsigned array_len;
+ const char *dynamic_len;
+ unsigned flags;
+ gen_dump_fn dump_fn;
+ gen_parse_fn parse_fn;
+};
+
+#define DUMP_PARSE_DECL(type) \
+ int gen_dump_ ## type(struct parse_string *, const char *, unsigned); \
+ int gen_parse_ ## type(char *, const char *);
+
+DUMP_PARSE_DECL(char)
+DUMP_PARSE_DECL(int)
+DUMP_PARSE_DECL(unsigned)
+DUMP_PARSE_DECL(double)
+DUMP_PARSE_DECL(float)
+
+#define gen_dump_unsigned_char gen_dump_char
+#define gen_parse_unsigned_char gen_parse_char
+
+#endif /* _GENSTRUCT_H */
\ No newline at end of file
diff -Npur --exclude=CVS --exclude=*.bak --exclude=*.o --exclude=*.po --exclude=*.so --exclude=.#* --exclude=Makefile --exclude=stamp-h --exclude=configure --exclude=findsmb --exclude=*proto*.h --exclude=build_env.h --exclude=config.* --exclude=bin --exclude=*.configure HEAD/source/include/includes.h HEAD-modules/source/include/includes.h
--- HEAD/source/include/includes.h Thu Dec 12 20:24:26 2002
+++ HEAD-modules/source/include/includes.h Mon Dec 16 19:34:18 2002
@@ -713,6 +713,7 @@ extern int errno;
#include "../tdb/tdbutil.h"
#include "talloc.h"
#include "nt_status.h"
+#include "genparser.h"
#include "ads.h"
#include "interfaces.h"
#include "hash.h"
More information about the samba-cvs
mailing list