Changeset: 9584bec12601 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9584bec12601
Modified Files:
Makefile.ag
configure.ag
monetdb5/extras/compiler/mal_compiler.c
monetdb5/mal/mal.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/alarm.c
monetdb5/modules/mal/groupby.c
monetdb5/optimizer/opt_mapreduce.c
monetdb5/optimizer/opt_octopus.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_statistics.c
monetdb5/scheduler/run_octopus.c
sql/backends/monet5/datacell/README
template/ChangeLog
template/ChangeLog-Archive
template/ChangeLog.Apr2011
template/ChangeLog.Aug2011
template/ChangeLog.Jun2010
template/ChangeLog.Mar2011
template/ChangeLog.Oct2010
template/Makefile.ag
template/README5
template/RunMapprove.in
template/RunMtest.in
template/bootstrap
template/conf/Makefile.ag
template/conf/Tests/All
template/conf/Tests/monetdb-template-conds.bat
template/conf/Tests/monetdb-template-conds.sh
template/conf/Tests/monetdb-template-conds.stable.err
template/conf/Tests/monetdb-template-conds.stable.out.32bit
template/conf/Tests/monetdb-template-conds.stable.out.64bit
template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit
template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit
template/conf/monetdb-template-config.in
template/configure.ag
template/de-bootstrap
template/rpm.mk.in
template/src/Makefile.ag
template/src/example.sql
template/src/monetdb5/Makefile.ag
template/src/monetdb5/Tests/All
template/src/monetdb5/Tests/hello.mal
template/src/monetdb5/Tests/hello.stable.err
template/src/monetdb5/Tests/hello.stable.out
template/src/monetdb5/example.c
template/src/monetdb5/example.h
template/src/monetdb5/example.mal
testing/Mtest.py.in
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 2375 to 300 lines):
diff --git a/Makefile.ag b/Makefile.ag
--- a/Makefile.ag
+++ b/Makefile.ag
@@ -27,4 +27,4 @@
EXTRA_DIST = bootstrap configure configure.ac configure.ag libversions \
MonetDB.spec rpm.mk.in COPYING README license.txt
HowToStart.rst
-EXTRA_DIST_DIR = NT debian template
+EXTRA_DIST_DIR = NT debian
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -283,14 +283,14 @@
static timertype th = 0;
static void
-timerHumanStop()
+timerHumanStop(void)
{
th = gettime();
}
static char htimbuf[32];
static char *
-timerHuman()
+timerHuman(void)
{
timertype t = th - t0;
diff --git a/clients/mapiclient/mnc.c b/clients/mapiclient/mnc.c
--- a/clients/mapiclient/mnc.c
+++ b/clients/mapiclient/mnc.c
@@ -68,7 +68,7 @@
static void
-usage()
+usage(void)
{
fprintf(stderr, "mnc [options] destination port\n");
fprintf(stderr, " -l | --listen listen for connection instead\n");
diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c
--- a/clients/mapiclient/stethoscope.c
+++ b/clients/mapiclient/stethoscope.c
@@ -152,7 +152,7 @@
static wthread *thds = NULL;
static void
-usage()
+usage(void)
{
fprintf(stderr, "stethoscope [options] +[trace options]
{<mod>.<fcn>}\n");
fprintf(stderr, " -d | --dbname=<database_name>\n");
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -1274,7 +1274,7 @@
}
static long
-usec()
+usec(void)
{
#ifdef HAVE_GETTIMEOFDAY
struct timeval tp;
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -114,7 +114,6 @@
dft_optimi=no
dft_develop=no
fi
-dft_warning=no
dnl small hack to get icc -no-gcc, done here because AC_PROG_CC shouldn't
dnl set GCC=yes if we use icc.
@@ -562,7 +561,10 @@
X_CFLAGS="$X_CFLAGS -Wformat=2 -Wno-format-nonliteral"
X_CFLAGS="$X_CFLAGS -Winit-self"
X_CFLAGS="$X_CFLAGS -Winvalid-pch"
+ X_CFLAGS="$X_CFLAGS -Wmissing-declarations"
X_CFLAGS="$X_CFLAGS -Wmissing-format-attribute"
+ X_CFLAGS="$X_CFLAGS -Wmissing-prototypes"
+ X_CFLAGS="$X_CFLAGS -Wold-style-definition"
X_CFLAGS="$X_CFLAGS -Wpacked"
X_CFLAGS="$X_CFLAGS -Wunknown-pragmas"
case "$CC-$gcc_ver" in
@@ -629,11 +631,8 @@
dnl X_CFLAGS="$X_CFLAGS -Wdisabled-optimization"
dnl X_CFLAGS="$X_CFLAGS -Wfloat-equal"
dnl X_CFLAGS="$X_CFLAGS -Winline"
- dnl X_CFLAGS="$X_CFLAGS -Wmissing-declarations"
dnl X_CFLAGS="$X_CFLAGS -Wmissing-noreturn"
- dnl X_CFLAGS="$X_CFLAGS -Wmissing-prototypes"
dnl X_CFLAGS="$X_CFLAGS -Wnested-externs"
- dnl X_CFLAGS="$X_CFLAGS -Wold-style-definition"
dnl X_CFLAGS="$X_CFLAGS -Wpadded"
dnl X_CFLAGS="$X_CFLAGS -Wredundant-decls"
dnl X_CFLAGS="$X_CFLAGS -Wshadow"
@@ -957,12 +956,6 @@
enable_optim=$enableval,
enable_optim=def_$dft_optimi)
-AC_ARG_ENABLE(warning,
- AS_HELP_STRING([--enable-warning],
- [enable extended compiler warnings (default=$dft_warning)]),
- enable_warning=$enableval,
- enable_warning=def_$dft_warning)
-
need_profiling=no
AC_ARG_ENABLE(profile,
AS_HELP_STRING([--enable-profile], [enable profiling (default=no)]),
@@ -1034,7 +1027,6 @@
esac
# make defaults real for flags which don't conflict with anything
enable_assert="`echo $enable_assert | sed 's:^def_::'`"
-enable_warning="`echo $enable_warning | sed 's:^def_::'`"
AC_MSG_CHECKING([for --enable-debug])
if test "x$enable_debug" = xyes; then
@@ -1247,25 +1239,6 @@
AC_MSG_RESULT([no])
fi
-AC_MSG_CHECKING([for --enable-warning])
-if test "x$enable_warning" = xyes; then
- dnl Basically, we disable/overule X_CFLAGS, i.e., "-Werror" and some
"-Wno-*".
- dnl All warnings should be on by default (see above).
- case $GCC-$host_os in
- yes-*)
- dnl GNU (gcc/g++)
- X_CFLAGS="-pedantic -Wno-long-long"
- ;;
- -linux*)
- dnl Intel ([ie]cc/[ie]cpc on Linux)
- X_CFLAGS=""
- ;;
- esac
- AC_MSG_RESULT([yes: ${X_CFLAGS}])
-else
- AC_MSG_RESULT([no])
-fi
-
AC_MSG_CHECKING([for --enable-profile])
if test "x$enable_prof" = xyes; then
AC_DEFINE(PROFILE, 1, [Compiler flag])
diff --git a/monetdb5/extras/compiler/mal_compiler.c
b/monetdb5/extras/compiler/mal_compiler.c
--- a/monetdb5/extras/compiler/mal_compiler.c
+++ b/monetdb5/extras/compiler/mal_compiler.c
@@ -747,7 +747,7 @@
* Dump the code produced in the standard output for ease of testing
*/
static void
-mccDump(){
+mccDump(void){
FILE *f;
int ch;
f= fopen(codefile,"r");
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -261,8 +261,7 @@
GDKfatal("Recompile with STRUCT_ALIGNED flag disabled\n");
#endif
}
-
-int mal_init(){
+int mal_init(void){
MT_lock_init( &mal_contextLock, "mal_contextLock");
MT_lock_init( &mal_remoteLock, "mal_remoteLock");
MT_lock_init( &mal_profileLock, "mal_profileLock");
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -96,7 +96,7 @@
}
static void
-AUTHcommit()
+AUTHcommit(void)
{
bat blist[3];
@@ -118,7 +118,7 @@
* can only be done after the GDK kernel has been initialized.
*/
str
-AUTHinitTables() {
+AUTHinitTables(void) {
int bid;
COL *b;
int isNew = 1;
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -118,7 +118,7 @@
GDKfree(x);
}
-static Client MCnewClient()
+static Client MCnewClient(void)
{
Client c;
mal_set_lock(mal_contextLock, "newClient");
@@ -475,7 +475,7 @@
* At the end of the server session all remaining structured are
* explicitly released to simplify detection of memory leakage problems.
*/
-void MCcleanupClients(){
+void MCcleanupClients(void){
Client c;
for(c = mal_clients; c < mal_clients+MAL_MAXCLIENTS; c++) {
/* if( c->nspace){ freeModuleList(c->nspace); c->nspace=0;}*/
@@ -488,9 +488,8 @@
MCexitClient(c);
}
}
-
-void
-MCexitPending()
+void
+MCexitPending(void)
{
Client c;
@@ -527,7 +526,7 @@
* Mapi connection. Moreover, the Mapi connection should disable the
administrator console.
*/
-int MCcountClients(){
+int MCcountClients(void){
int cnt=0;
Client c;
for(c = mal_clients; c < mal_clients+MAL_MAXCLIENTS; c++)
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -1483,7 +1483,7 @@
printStack(cntxt->fdout,mb,stk);
}
static int mdbSessionActive;
-int mdbSession(){
+int mdbSession(void){
return mdbSessionActive;
}
diff --git a/monetdb5/mal/mal_factory.c b/monetdb5/mal/mal_factory.c
--- a/monetdb5/mal/mal_factory.c
+++ b/monetdb5/mal/mal_factory.c
@@ -275,7 +275,7 @@
mal_export Plant newPlant(MalBlkPtr mb);
int
-factoryHasFreeSpace(){
+factoryHasFreeSpace(void){
return lastPlant <MAXPLANTS-1;
}
static int
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -293,7 +293,7 @@
* because they may still be in use.
*/
void
-unloadLibraries()
+unloadLibraries(void)
{
int i;
diff --git a/monetdb5/mal/mal_namespace.c b/monetdb5/mal/mal_namespace.c
--- a/monetdb5/mal/mal_namespace.c
+++ b/monetdb5/mal/mal_namespace.c
@@ -114,7 +114,7 @@
#endif
}
-void initNamespace() {
+void initNamespace(void) {
namespace.nme= (str *) GDKzalloc(sizeof(str *) * MAXIDENTIFIERS);
namespace.link= (int *) GDKzalloc(sizeof(int) * MAXIDENTIFIERS);
namespace.hit= (int *) GDKzalloc(sizeof(int) * MAXIDENTIFIERS);
@@ -147,7 +147,7 @@
backup.nmetop= 256; /* hash overflow */
#endif
}
-void finishNamespace() {
+void finishNamespace(void) {
int i;
for(i=0;i<namespace.nmetop; i++) {
if( namespace.nme[i])
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -115,8 +115,8 @@
short idCharacter[256];
short idCharacter2[256];
-void
-initParser()
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
