svn commit: samba r26571 - in branches/SAMBA_4_0: . source
source/build/m4 source/build/smb_build source/lib/registry
source/libcli/util source/scripting/python
jelmer at samba.org
jelmer at samba.org
Sun Dec 23 20:22:48 GMT 2007
Author: jelmer
Date: 2007-12-23 20:22:46 +0000 (Sun, 23 Dec 2007)
New Revision: 26571
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26571
Log:
Hide warnings about unused macros and casting qualifiers in autogenerated files.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/build/m4/check_cc.m4
branches/SAMBA_4_0/source/build/smb_build/input.pm
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/dynconfig.mk
branches/SAMBA_4_0/source/lib/registry/registry_wrap.c
branches/SAMBA_4_0/source/libcli/util/errors.i
branches/SAMBA_4_0/source/scripting/python/misc_wrap.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4 2007-12-23 19:19:41 UTC (rev 26570)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4 2007-12-23 20:22:46 UTC (rev 26571)
@@ -112,6 +112,10 @@
AX_CFLAGS_GCC_OPTION(-Wformat=2, DEVELOPER_CFLAGS)
AX_CFLAGS_GCC_OPTION(-Wdeclaration-after-statement, DEVELOPER_CFLAGS)
AX_CFLAGS_GCC_OPTION(-Wunused-macros, DEVELOPER_CFLAGS)
+ AX_CFLAGS_GCC_OPTION(-Wno-unused-macros, CFLAG_NO_UNUSED_MACROS)
+ AC_SUBST(CFLAG_NO_CAST_QUAL)
+ AC_SUBST(CFLAG_NO_UNUSED_MACROS)
+ AX_CFLAGS_GCC_OPTION(-Wno-cast-qual, CFLAG_NO_CAST_QUAL)
# AX_CFLAGS_GCC_OPTION(-Wextra, DEVELOPER_CFLAGS)
# AX_CFLAGS_GCC_OPTION(-Wc++-compat, DEVELOPER_CFLAGS)
# AX_CFLAGS_GCC_OPTION(-Wmissing-prototypes, DEVELOPER_CFLAGS)
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm 2007-12-23 19:19:41 UTC (rev 26570)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2007-12-23 20:22:46 UTC (rev 26571)
@@ -165,6 +165,9 @@
$python->{OBJ_FILES} = ["$dirname$basename\_wrap.o"];
$python->{LIBRARY_REALNAME} = "_$basename.\$(SHLIBEXT)";
$python->{PYTHON_FILES} = ["$dirname$basename.py"];
+ unless (defined($python->{CFLAGS})) { $python->{CFLAGS} = []; }
+ push (@{$python->{CFLAGS}}, $config::config{CFLAG_NO_UNUSED_MACROS});
+ push (@{$python->{CFLAGS}}, $config::config{CFLAG_NO_CAST_QUAL});
} else {
my $basename = $python->{NAME};
$basename =~ s/^python_//g;
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2007-12-23 19:19:41 UTC (rev 26570)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2007-12-23 20:22:46 UTC (rev 26571)
@@ -121,15 +121,15 @@
# Dependencies command
DEPENDS = \$(CC) -M -MG -MP -MT \$(<:.c=.o) -MT \$@ \\
- `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
- \$(CFLAGS) \$(FIRST_PREREQ) -o \$@
+ \$(CFLAGS) `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
+ \$(CPPFLAGS) \$(FIRST_PREREQ) -o \$@
# Dependencies for host objects
HDEPENDS = \$(CC) -M -MG -MP -MT \$(<:.c=.ho) -MT \$@ \\
- `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
- \$(HOSTCC_FLAGS) \$(FIRST_PREREQ) -o \$@
+ \$(HOSTCC_FLAGS) `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
+ \$(CPPFLAGS) \$(FIRST_PREREQ) -o \$@
# Dependencies for precompiled headers
PCHDEPENDS = \$(CC) -M -MG -MT include/includes.h.gch -MT \$@ \\
- \$(CFLAGS) \$(FIRST_PREREQ) -o \$@
+ \$(CFLAGS) \$(CPPFLAGS) \$(FIRST_PREREQ) -o \$@
# \$< is broken in older BSD versions:
# when \$@ is foo/bar.o, \$< could be torture/foo/bar.c
@@ -140,21 +140,23 @@
# building with \$srcdir != \$builddir work.
# Run a static analysis checker
-CHECK = \$(CC_CHECKER) `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
- \$(CFLAGS) \$(PICFLAG) -c \$(FIRST_PREREQ) -o \$@
+CHECK = \$(CC_CHECKER) \$(CFLAGS) `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
+ \$(PICFLAG) \$(CPPLAGS) -c \$(FIRST_PREREQ) -o \$@
# Run the configured compiler
-COMPILE = \$(CC) `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
- \$(CFLAGS) \$(PICFLAG) -c \$(FIRST_PREREQ) -o \$@
+COMPILE = \$(CC) \$(CFLAGS) \$(PICFLAG) \\
+ `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
+ \$(CPPFLAGS) \\
+ -c \$(FIRST_PREREQ) -o \$@
# Run the compiler for the build host
-HCOMPILE = \$(HOSTCC) `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
- \$(HOSTCC_FLAGS) -c \$(FIRST_PREREQ) -o \$@
+HCOMPILE = \$(HOSTCC) \$(HOSTCC_FLAGS) `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
+ \$(CPPFLAGS) -c \$(FIRST_PREREQ) -o \$@
# Precompile headers
PCHCOMPILE = @\$(CC) -Ilib/replace \\
- `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
- \$(CFLAGS) \$(PICFLAG) -c \$(FIRST_PREREQ) -o \$@
+ \$(CFLAGS) `\$(PERL) \$(srcdir)/script/cflags.pl \$@` \\
+ \$(PICFLAG) \$(CPPFLAGS) -c \$(FIRST_PREREQ) -o \$@
__EOD__
);
@@ -190,7 +192,8 @@
CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/lib/replace -I\$(srcdir)/lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $self->{config}->{CPPFLAGS}
CC=$self->{config}->{CC}
-CFLAGS=$self->{config}->{CFLAGS} \$(CPPFLAGS)
+CFLAGS=$self->{config}->{CFLAGS}
+CFLAG_NO_UNUSED_MACROS=$self->{config}->{CFLAG_NO_UNUSED_MACROS}
PICFLAG=$self->{config}->{PICFLAG}
INSTALL_LINK_FLAGS=$extra_link_flags
@@ -210,7 +213,7 @@
SHLIBEXT=$self->{config}->{SHLIBEXT}
HOSTCC=$self->{config}->{HOSTCC}
-HOSTCC_FLAGS=-D_SAMBA_HOSTCC_ $self->{config}->{CFLAGS} \$(CPPFLAGS)
+HOSTCC_FLAGS=-D_SAMBA_HOSTCC_ \$(CFLAGS)
HOSTLD=$self->{config}->{HOSTLD}
HOSTLD_FLAGS=$self->{config}->{LDFLAGS}
Modified: branches/SAMBA_4_0/source/dynconfig.mk
===================================================================
--- branches/SAMBA_4_0/source/dynconfig.mk 2007-12-23 19:19:41 UTC (rev 26570)
+++ branches/SAMBA_4_0/source/dynconfig.mk 2007-12-23 20:22:46 UTC (rev 26571)
@@ -21,5 +21,5 @@
dynconfig.o: dynconfig.c Makefile
@echo Compiling $<
- @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $(PICFLAG) \
+ @$(CC) $(CFLAGS) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CPPFLAGS) $(PICFLAG) \
$(PATH_FLAGS) -c $(FIRST_PREREQ) -o $@
Modified: branches/SAMBA_4_0/source/lib/registry/registry_wrap.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/registry_wrap.c 2007-12-23 19:19:41 UTC (rev 26570)
+++ branches/SAMBA_4_0/source/lib/registry/registry_wrap.c 2007-12-23 20:22:46 UTC (rev 26571)
@@ -2929,9 +2929,7 @@
};
arg3 = NULL;
- {
- arg4 = NULL;
- }
+ arg4 = NULL;
arg1 = NULL;
arg2 = &tmp2;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:Registry",kwnames,&obj0,&obj1)) SWIG_fail;
@@ -3492,12 +3490,8 @@
};
arg3 = NULL;
- {
- arg4 = NULL;
- }
- {
- arg5 = loadparm_init(NULL);
- }
+ arg4 = NULL;
+ arg5 = loadparm_init(NULL);
arg1 = NULL;
arg6 = &tmp6;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:hive_key",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -3573,12 +3567,8 @@
};
arg3 = NULL;
- {
- arg4 = NULL;
- }
- {
- arg5 = loadparm_init(NULL);
- }
+ arg4 = NULL;
+ arg5 = loadparm_init(NULL);
arg1 = NULL;
arg6 = &tmp6;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:open_ldb",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -3730,13 +3720,9 @@
(char *) "lp_ctx",(char *) "session_info",(char *) "credentials", NULL
};
- {
- arg3 = loadparm_init(NULL);
- }
+ arg3 = loadparm_init(NULL);
arg4 = NULL;
- {
- arg5 = NULL;
- }
+ arg5 = NULL;
arg1 = NULL;
arg2 = &tmp2;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:open_samba",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
Modified: branches/SAMBA_4_0/source/libcli/util/errors.i
===================================================================
--- branches/SAMBA_4_0/source/libcli/util/errors.i 2007-12-23 19:19:41 UTC (rev 26570)
+++ branches/SAMBA_4_0/source/libcli/util/errors.i 2007-12-23 20:22:46 UTC (rev 26571)
@@ -20,7 +20,7 @@
#ifdef SWIGPYTHON
%typemap(out,noblock=1) WERROR {
if (!W_ERROR_IS_OK($1)) {
- PyObject *obj = Py_BuildValue("(i,s)", $1.v, win_errstr($1));
+ PyObject *obj = Py_BuildValue("(i,s)", $1.v, (char *)win_errstr($1));
PyErr_SetObject(PyExc_RuntimeError, obj);
SWIG_fail;
} else if ($result == NULL) {
@@ -30,7 +30,7 @@
%typemap(out,noblock=1) NTSTATUS {
if (NT_STATUS_IS_ERR($1)) {
- PyObject *obj = Py_BuildValue("(i,s)", $1.v, nt_errstr($1));
+ PyObject *obj = Py_BuildValue("(i,s)", $1.v, (char *)nt_errstr($1));
PyErr_SetObject(PyExc_RuntimeError, obj);
SWIG_fail;
} else if ($result == NULL) {
Modified: branches/SAMBA_4_0/source/scripting/python/misc_wrap.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/python/misc_wrap.c 2007-12-23 19:19:41 UTC (rev 26570)
+++ branches/SAMBA_4_0/source/scripting/python/misc_wrap.c 2007-12-23 20:22:46 UTC (rev 26571)
@@ -2837,9 +2837,7 @@
(char *) "ldb",(char *) "creds", NULL
};
- {
- arg2 = NULL;
- }
+ arg2 = NULL;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ldb_set_credentials",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 | 0 );
if (!SWIG_IsOK(res1)) {
@@ -2914,9 +2912,7 @@
(char *) "ldb",(char *) "lp_ctx", NULL
};
- {
- arg2 = loadparm_init(NULL);
- }
+ arg2 = loadparm_init(NULL);
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ldb_set_loadparm",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ldb_context, 0 | 0 );
if (!SWIG_IsOK(res1)) {
More information about the samba-cvs
mailing list