Changeset: 92137f17d902 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92137f17d902
Modified Files:
clients/Tests/exports.stable.out
common/stream/stream_socket.h
configure.ag
gdk/gdk_private.h
monetdb5/extras/rapi/Makefile.ag
monetdb5/modules/kernel/mmath.h
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
sql/backends/monet5/sql.h
sql/backends/monet5/sql_cast.h
sql/backends/monet5/sql_scenario.h
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/bam/bam_db_interface.h
sql/backends/monet5/vaults/bam/bam_export.h
sql/backends/monet5/vaults/bam/bam_loader.h
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/netcdf/netcdf.c
sql/backends/monet5/vaults/shp/shp.c
Branch: Jul2017
Log Message:
Fixed some compiler warnings, mostly redundant declarations.
We do not enable -Wredundant-decls with which these problems were
found because of problems with the declaration of sqlparse(). It is
declared by bison in a generated file which we cannot include
everywhere we need the function.
diffs (truncated from 1097 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1909,7 +1909,6 @@ str alter_tableRef;
str alter_triggerRef;
str alter_typeRef;
str alter_userRef;
-str alter_userRef;
str alter_viewRef;
str andRef;
str antijoinRef;
@@ -2000,7 +1999,6 @@ str create_tableRef;
str create_triggerRef;
str create_typeRef;
str create_userRef;
-str create_userRef;
str create_viewRef;
str crossRef;
str dataflowRef;
@@ -2036,7 +2034,6 @@ str drop_tableRef;
str drop_triggerRef;
str drop_typeRef;
str drop_userRef;
-str drop_userRef;
str drop_viewRef;
void dumpExceptionsToStream(stream *out, str msg);
str emptybindRef;
@@ -2143,7 +2140,6 @@ str identityRef;
str ifthenelseRef;
str ilikeRef;
str ilikeselectRef;
-str ilikeselectRef;
str ilikethetaselectRef;
str ilikeuselectRef;
void initHeartbeat(void);
@@ -2202,7 +2198,6 @@ str levenshteinbasic2_impl(int *result,
str levenshteinbasic_impl(int *result, str *s, str *t);
str likeRef;
str likeselectRef;
-str likeselectRef;
str likethetaselectRef;
str likeuselectRef;
str listRef;
@@ -2479,7 +2474,6 @@ str sinkRef;
void slash_2_dir_sep(str fname);
str sliceRef;
str sortRef;
-str sortRef;
str sortReverseRef;
str soundex_impl(str *res, str *Name);
str sqlRef;
diff --git a/common/stream/stream_socket.h b/common/stream/stream_socket.h
--- a/common/stream/stream_socket.h
+++ b/common/stream/stream_socket.h
@@ -9,6 +9,9 @@
/* This file contains the prototype declarations of the stream
* functions that need special include files (sockets) */
+#ifndef _STREAM_SOCKET_H_
+#define _STREAM_SOCKET_H_
+
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
@@ -27,3 +30,5 @@ stream_export stream *socket_rstream(SOC
stream_export stream *socket_wstream(SOCKET socket, const char *name);
stream_export stream *socket_rastream(SOCKET socket, const char *name);
stream_export stream *socket_wastream(SOCKET socket, const char *name);
+
+#endif /* _STREAM_SOCKET_H_ */
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -626,6 +626,7 @@ AS_VAR_IF([enable_strict], [yes], [
MCHECK_ADD_FLAG([-Wduplicated-cond])
MCHECK_ADD_FLAG([-Wduplicated-branches])
MCHECK_ADD_FLAG([-Wrestrict])
+ MCHECK_ADD_FLAG([-Wnested-externs])
# We can deal with -Wunrechable-code on modern
# compilers, but FreeBSD's clang (3.4.1) is too old.
@@ -646,7 +647,6 @@ AS_VAR_IF([enable_strict], [yes], [
dnl MCHECK_ADD_FLAG([-Wfloat-equal])
dnl MCHECK_ADD_FLAG([-Winline])
dnl MCHECK_ADD_FLAG([-Wmissing-noreturn])
- dnl MCHECK_ADD_FLAG([-Wnested-externs])
dnl MCHECK_ADD_FLAG([-Wpadded])
dnl MCHECK_ADD_FLAG([-Wredundant-decls])
dnl MCHECK_ADD_FLAG([-Wshadow])
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -108,8 +108,6 @@ void BBPdump(void); /* never called: fo
__attribute__((__visibility__("hidden")));
__hidden Heap *createOIDXheap(BAT *b, int stable)
__attribute__((__visibility__("hidden")));
-__hidden void gdk_bbp_reset(void)
- __attribute__((__visibility__("hidden")));
__hidden gdk_return BUNreplace(BAT *b, oid left, const void *right, bit force)
__attribute__ ((__warn_unused_result__))
__attribute__((__visibility__("hidden")));
@@ -119,9 +117,6 @@ void BBPdump(void); /* never called: fo
__hidden gdk_return GDKextendf(int fd, size_t size, const char *fn)
__attribute__ ((__warn_unused_result__))
__attribute__((__visibility__("hidden")));
-__hidden gdk_return GDKextractParentAndLastDirFromPath(const char *path, char
*last_dir_parent, char *last_dir)
- __attribute__ ((__warn_unused_result__))
- __attribute__((__visibility__("hidden")));
__hidden int GDKfdlocate(int farmid, const char *nme, const char *mode, const
char *ext)
__attribute__((__visibility__("hidden")));
__hidden FILE *GDKfilelocate(int farmid, const char *nme, const char *mode,
const char *ext)
diff --git a/monetdb5/extras/rapi/Makefile.ag b/monetdb5/extras/rapi/Makefile.ag
--- a/monetdb5/extras/rapi/Makefile.ag
+++ b/monetdb5/extras/rapi/Makefile.ag
@@ -21,6 +21,9 @@ INCLUDES = \
MTSAFE
+# R include files contain redundant declarations
+rapi_CFLAGS = -Wno-redundant-decls
+
lib__rapi = {
MODULE
DIR = libdir/monetdb5
diff --git a/monetdb5/modules/kernel/mmath.h b/monetdb5/modules/kernel/mmath.h
--- a/monetdb5/modules/kernel/mmath.h
+++ b/monetdb5/modules/kernel/mmath.h
@@ -55,11 +55,6 @@ MNisinf(double x)
# endif
#endif /* HAVE_FPCLASSIFY */
-extern double sqrt(double x);
-extern double sin(double x);
-extern double cos(double x);
-extern double fabs(double x);
-
#define unopbaseM5_export(X1,X2)\
mal_export str MATHunary##X1##X2(X2 *res, const X2 *a);
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -20,218 +20,201 @@ str affectedRowsRef;
str aggrRef;
str alarmRef;
str algebraRef;
-str andRef;
-str appendidxRef;
-str appendRef;
-str assertRef;
+str alter_add_tableRef;
+str alter_constraintRef;
+str alter_del_tableRef;
+str alter_functionRef;
+str alter_indexRef;
+str alter_roleRef;
+str alter_schemaRef;
str alter_seqRef;
-str alter_schemaRef;
-str alter_viewRef;
+str alter_set_tableRef;
str alter_tableRef;
-str alter_constraintRef;
+str alter_triggerRef;
str alter_typeRef;
str alter_userRef;
-str alter_roleRef;
-str alter_userRef;
-str alter_indexRef;
-str alter_functionRef;
-str alter_triggerRef;
-str alter_add_tableRef;
-str alter_del_tableRef;
-str alter_set_tableRef;
+str alter_viewRef;
+str andRef;
+str antijoinRef;
+str appendidxRef;
+str appendRef;
+str arrayRef;
+str assertRef;
str attachRef;
str avgRef;
-str batRef;
+str bandjoinRef;
+str basketRef;
str batalgebraRef;
-str arrayRef;
-str basketRef;
str batcalcRef;
-str batstrRef;
-str batmtimeRef;
+str batmalRef;
str batmmathRef;
+str batmtimeRef;
+str batpyapi3Ref;
+str batpyapiRef;
+str batrapiRef;
+str batRef;
+str batsqlRef;
+str batstrRef;
str batxmlRef;
-str batsqlRef;
+str bbpRef;
str betweenRef;
str betweensymmetricRef;
-str blockRef;
-str bbpRef;
-str tidRef;
-str dateRef;
-str deltaRef;
-str subdeltaRef;
-str projectdeltaRef;
str binddbatRef;
str bindidxRef;
str bindRef;
-str emptybindRef;
-str emptybindidxRef;
+str blockRef;
str bpmRef;
str bstreamRef;
str calcRef;
str clear_tableRef;
str closeRef;
+str columnBindRef;
str columnRef;
-str columnBindRef;
str commitRef;
str connectRef;
-str countRef;
-str subcountRef;
+str copy_fromRef;
str copyRef;
-str copy_fromRef;
-str export_tableRef;
str count_no_nilRef;
-str crossRef;
+str countRef;
+str create_constraintRef;
+str create_functionRef;
+str create_indexRef;
str createRef;
-str create_seqRef;
+str create_roleRef;
str create_schemaRef;
-str create_viewRef;
+str create_seqRef;
str create_tableRef;
-str create_constraintRef;
+str create_triggerRef;
str create_typeRef;
str create_userRef;
-str create_roleRef;
-str create_userRef;
-str create_indexRef;
-str create_functionRef;
-str create_triggerRef;
+str create_viewRef;
+str crossRef;
str dataflowRef;
+str dateRef;
str dblRef;
str defineRef;
str deleteRef;
+str deltaRef;
+str dense_rankRef;
str differenceRef;
-str drop_seqRef;
-str intersectRef;
+str diffRef;
+str disconnectRef;
+str divRef;
+str drop_constraintRef;
+str drop_functionRef;
+str drop_indexRef;
+str drop_roleRef;
str drop_schemaRef;
-str drop_viewRef;
+str drop_seqRef;
str drop_tableRef;
-str drop_constraintRef;
+str drop_triggerRef;
str drop_typeRef;
str drop_userRef;
-str drop_roleRef;
-str drop_userRef;
-str drop_indexRef;
-str drop_functionRef;
-str drop_triggerRef;
-str subdiffRef;
-str diffRef;
-str subinterRef;
-str mergecandRef;
-str mergepackRef;
-str intersectcandRef;
+str drop_viewRef;
+str emptybindidxRef;
+str emptybindRef;
str eqRef;
-str disconnectRef;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
