svn commit: samba r14381 - in branches/SAMBA_4_0/source: include
lib/samba3 lib/util librpc/rpc param scripting/ejs
jelmer at samba.org
jelmer at samba.org
Tue Mar 14 15:22:36 GMT 2006
Author: jelmer
Date: 2006-03-14 15:22:36 +0000 (Tue, 14 Mar 2006)
New Revision: 14381
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14381
Log:
Kill structs.h
Added:
branches/SAMBA_4_0/source/param/param.h
Removed:
branches/SAMBA_4_0/source/include/structs.h
branches/SAMBA_4_0/source/param/generic.h
Modified:
branches/SAMBA_4_0/source/include/includes.h
branches/SAMBA_4_0/source/lib/samba3/samba3.h
branches/SAMBA_4_0/source/lib/util/util.h
branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
branches/SAMBA_4_0/source/param/
branches/SAMBA_4_0/source/param/config.mk
branches/SAMBA_4_0/source/param/generic.c
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_param.c
Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h 2006-03-14 15:03:25 UTC (rev 14380)
+++ branches/SAMBA_4_0/source/include/includes.h 2006-03-14 15:22:36 UTC (rev 14381)
@@ -111,7 +111,6 @@
#include "talloc/talloc.h"
#include "core.h"
#include "charset/charset.h"
-#include "structs.h"
#include "util/util.h"
#include "param/param.h"
#include "libcli/util/nterr.h"
Deleted: branches/SAMBA_4_0/source/include/structs.h
===================================================================
--- branches/SAMBA_4_0/source/include/structs.h 2006-03-14 15:03:25 UTC (rev 14380)
+++ branches/SAMBA_4_0/source/include/structs.h 2006-03-14 15:22:36 UTC (rev 14381)
@@ -1,32 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- Copyright (C) Andrew Tridgell 2004
-
- 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.
-*/
-
-/*
- this file contains pre-declarations of private structures to avoid the
- "scope is only this definition or declaration" warning
-*/
-
-struct asn1_data;
-struct smbsrv_tcon;
-struct smbsrv_connection;
-struct param_context;
-struct smbcli_tree;
-struct smb2_tree;
-struct socket_address;
Modified: branches/SAMBA_4_0/source/lib/samba3/samba3.h
===================================================================
--- branches/SAMBA_4_0/source/lib/samba3/samba3.h 2006-03-14 15:03:25 UTC (rev 14380)
+++ branches/SAMBA_4_0/source/lib/samba3/samba3.h 2006-03-14 15:22:36 UTC (rev 14381)
@@ -23,7 +23,7 @@
#include "librpc/gen_ndr/security.h"
#include "librpc/gen_ndr/samr.h"
-#include "param/generic.h"
+#include "param/param.h"
struct samba3_samaccount {
uint32_t logon_time,
Modified: branches/SAMBA_4_0/source/lib/util/util.h
===================================================================
--- branches/SAMBA_4_0/source/lib/util/util.h 2006-03-14 15:03:25 UTC (rev 14380)
+++ branches/SAMBA_4_0/source/lib/util/util.h 2006-03-14 15:22:36 UTC (rev 14381)
@@ -30,6 +30,8 @@
*/
struct substitute_context;
+struct asn1_data;
+struct smbsrv_tcon;
#include "util/xfile.h"
#include "util/debug.h"
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h 2006-03-14 15:03:25 UTC (rev 14380)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h 2006-03-14 15:22:36 UTC (rev 14381)
@@ -249,6 +249,10 @@
struct epm_tower;
struct epm_floor;
+struct smbcli_tree;
+struct smb2_tree;
+struct socket_address;
+
#include "librpc/rpc/dcerpc_proto.h"
#endif /* __DCERPC_H__ */
Property changes on: branches/SAMBA_4_0/source/param
___________________________________________________________________
Name: svn:ignore
- param.h
*.d
*.po32
*.po
+ proto.h
*.d
*.po32
*.po
Modified: branches/SAMBA_4_0/source/param/config.mk
===================================================================
--- branches/SAMBA_4_0/source/param/config.mk 2006-03-14 15:03:25 UTC (rev 14380)
+++ branches/SAMBA_4_0/source/param/config.mk 2006-03-14 15:22:36 UTC (rev 14381)
@@ -4,7 +4,7 @@
generic.o \
../lib/version.o
REQUIRED_SUBSYSTEMS = LIBBASIC
-PRIVATE_PROTO_HEADER = param.h
+PRIVATE_PROTO_HEADER = proto.h
PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \
-DBINDIR=\"$(BINDIR)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
Modified: branches/SAMBA_4_0/source/param/generic.c
===================================================================
--- branches/SAMBA_4_0/source/param/generic.c 2006-03-14 15:03:25 UTC (rev 14380)
+++ branches/SAMBA_4_0/source/param/generic.c 2006-03-14 15:22:36 UTC (rev 14381)
@@ -19,7 +19,7 @@
#include "includes.h"
#include "dlinklist.h"
-#include "param/generic.h"
+#include "param/param.h"
#include "system/filesys.h"
struct param_section *param_get_section(struct param_context *ctx, const char *name)
Deleted: branches/SAMBA_4_0/source/param/generic.h
===================================================================
--- branches/SAMBA_4_0/source/param/generic.h 2006-03-14 15:03:25 UTC (rev 14380)
+++ branches/SAMBA_4_0/source/param/generic.h 2006-03-14 15:22:36 UTC (rev 14381)
@@ -1,41 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Generic parameter parsing interface
- Copyright (C) Jelmer Vernooij 2005
-
- 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 _PARAM_GENERIC_H /* _PARAM_GENERIC_H */
-#define _PARAM_GENERIC_H
-
-struct param_context {
- struct param_section *sections;
-};
-
-struct param {
- const char *name;
- char *value;
- const char **list_value;
- struct param *prev, *next;
-};
-
-struct param_section {
- const char *name;
- struct param_section *prev, *next;
- struct param *parameters;
-};
-
-#endif /* _PARAM_GENERIC_H */
Copied: branches/SAMBA_4_0/source/param/param.h (from rev 14378, branches/SAMBA_4_0/source/param/generic.h)
===================================================================
--- branches/SAMBA_4_0/source/param/generic.h 2006-03-14 14:29:41 UTC (rev 14378)
+++ branches/SAMBA_4_0/source/param/param.h 2006-03-14 15:22:36 UTC (rev 14381)
@@ -0,0 +1,46 @@
+/*
+ Unix SMB/CIFS implementation.
+ Generic parameter parsing interface
+ Copyright (C) Jelmer Vernooij 2005
+
+ 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 _PARAM_H /* _PARAM_H */
+#define _PARAM_H
+
+struct param_context {
+ struct param_section *sections;
+};
+
+struct param {
+ const char *name;
+ char *value;
+ const char **list_value;
+ struct param *prev, *next;
+};
+
+struct param_section {
+ const char *name;
+ struct param_section *prev, *next;
+ struct param *parameters;
+};
+
+struct param_context;
+struct smbsrv_connection;
+
+#include "param/proto.h"
+
+#endif /* _PARAM_H */
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_param.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_param.c 2006-03-14 15:03:25 UTC (rev 14380)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_param.c 2006-03-14 15:22:36 UTC (rev 14381)
@@ -23,7 +23,7 @@
#include "includes.h"
#include "scripting/ejs/smbcalls.h"
#include "lib/appweb/ejs/ejs.h"
-#include "param/generic.h"
+#include "param/param.h"
/*
get parameter
More information about the samba-cvs
mailing list