Changeset: 0a6ccd010333 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a6ccd010333
Added Files:
        sql/test/pg_regress/monetdb/abstime.sql
        sql/test/pg_regress/monetdb/aggregates.sql
        sql/test/pg_regress/monetdb/alter_table.sql
        sql/test/pg_regress/monetdb/arrays.sql
        sql/test/pg_regress/monetdb/bit.sql
        sql/test/pg_regress/monetdb/boolean.sql
        sql/test/pg_regress/monetdb/box.sql
        sql/test/pg_regress/monetdb/btree_index.sql
        sql/test/pg_regress/monetdb/case.sql
        sql/test/pg_regress/monetdb/circle.sql
        sql/test/pg_regress/monetdb/cluster.sql
        sql/test/pg_regress/monetdb/comments.sql
        sql/test/pg_regress/monetdb/conversion.sql
        sql/test/pg_regress/monetdb/copy2.sql
        sql/test/pg_regress/monetdb/create_aggregate.sql
        sql/test/pg_regress/monetdb/create_index.sql
        sql/test/pg_regress/monetdb/create_misc.sql
        sql/test/pg_regress/monetdb/create_operator.sql
        sql/test/pg_regress/monetdb/create_type.sql
        sql/test/pg_regress/monetdb/create_view.sql
        sql/test/pg_regress/monetdb/date.sql
        sql/test/pg_regress/monetdb/domain.sql
        sql/test/pg_regress/monetdb/drop.sql
        sql/test/pg_regress/monetdb/errors.sql
        sql/test/pg_regress/monetdb/float4.sql
        sql/test/pg_regress/monetdb/float8.sql
        sql/test/pg_regress/monetdb/foreign_key.sql
        sql/test/pg_regress/monetdb/geometry.sql
        sql/test/pg_regress/monetdb/hash_index.sql
        sql/test/pg_regress/monetdb/horology.sql
        sql/test/pg_regress/monetdb/inet.sql
        sql/test/pg_regress/monetdb/inherit.sql
        sql/test/pg_regress/monetdb/insert.sql
        sql/test/pg_regress/monetdb/int2.sql
        sql/test/pg_regress/monetdb/int4.sql
        sql/test/pg_regress/monetdb/int8.sql
        sql/test/pg_regress/monetdb/interval.sql
        sql/test/pg_regress/monetdb/join.sql
        sql/test/pg_regress/monetdb/limit.sql
        sql/test/pg_regress/monetdb/lseg.sql
        sql/test/pg_regress/monetdb/mule_internal.sql
        sql/test/pg_regress/monetdb/name.sql
        sql/test/pg_regress/monetdb/namespace.sql
        sql/test/pg_regress/monetdb/numeric.sql
        sql/test/pg_regress/monetdb/numeric_big.sql
        sql/test/pg_regress/monetdb/numerology.sql
        sql/test/pg_regress/monetdb/oid.sql
        sql/test/pg_regress/monetdb/oidjoins.sql
        sql/test/pg_regress/monetdb/opr_sanity.sql
        sql/test/pg_regress/monetdb/path.sql
        sql/test/pg_regress/monetdb/plpgsql.sql
        sql/test/pg_regress/monetdb/point.sql
        sql/test/pg_regress/monetdb/polygon.sql
        sql/test/pg_regress/monetdb/polymorphism.sql
        sql/test/pg_regress/monetdb/portals.sql
        sql/test/pg_regress/monetdb/portals_p2.sql
        sql/test/pg_regress/monetdb/prepare.sql
        sql/test/pg_regress/monetdb/privileges.sql
        sql/test/pg_regress/monetdb/random.sql
        sql/test/pg_regress/monetdb/rangefuncs.sql
        sql/test/pg_regress/monetdb/reltime.sql
        sql/test/pg_regress/monetdb/rowtypes.sql
        sql/test/pg_regress/monetdb/rules.sql
        sql/test/pg_regress/monetdb/sanity_check.sql
        sql/test/pg_regress/monetdb/select.sql
        sql/test/pg_regress/monetdb/select_distinct.sql
        sql/test/pg_regress/monetdb/select_distinct_on.sql
        sql/test/pg_regress/monetdb/select_having.sql
        sql/test/pg_regress/monetdb/select_implicit.sql
        sql/test/pg_regress/monetdb/select_into.sql
        sql/test/pg_regress/monetdb/select_views.sql
        sql/test/pg_regress/monetdb/sequence.sql
        sql/test/pg_regress/monetdb/sql_ascii.sql
        sql/test/pg_regress/monetdb/stats.sql
        sql/test/pg_regress/monetdb/strings.sql
        sql/test/pg_regress/monetdb/subselect.sql
        sql/test/pg_regress/monetdb/temp.sql
        sql/test/pg_regress/monetdb/time.sql
        sql/test/pg_regress/monetdb/timestamp.sql
        sql/test/pg_regress/monetdb/timestamptz.sql
        sql/test/pg_regress/monetdb/timetz.sql
        sql/test/pg_regress/monetdb/tinterval.sql
        sql/test/pg_regress/monetdb/transactions.sql
        sql/test/pg_regress/monetdb/triggers.sql
        sql/test/pg_regress/monetdb/truncate.sql
        sql/test/pg_regress/monetdb/type_sanity.sql
        sql/test/pg_regress/monetdb/union.sql
        sql/test/pg_regress/monetdb/update.sql
        sql/test/pg_regress/monetdb/vacuum.sql
        sql/test/pg_regress/monetdb/without_oid.sql
Modified Files:
        .hgtags
        MonetDB.spec
        NT/installer32/MonetDB-ODBC-Installer.vdproj
        NT/installer32/MonetDB5-Geom-Module.vdproj
        NT/installer32/MonetDB5-SQL-Installer.vdproj
        NT/installer64/MonetDB-ODBC-Installer.vdproj
        NT/installer64/MonetDB5-Geom-Module.vdproj
        NT/installer64/MonetDB5-SQL-Installer.vdproj
        NT/monetdb_config.h.in
        NT/rules.msc
        buildtools/ChangeLog.Jan2014
        clients/R/MonetDB.R/src/mapi.c
        clients/mapiclient/ReadlineTools.c
        clients/mapiclient/dump.c
        clients/mapiclient/mclient.c
        clients/mapiclient/tomograph.c
        clients/mapilib/mapi.rc
        clients/odbc/driver/ODBCUtil.c
        clients/odbc/driver/SQLColumnPrivileges.c
        clients/odbc/driver/SQLColumns.c
        clients/odbc/driver/SQLGetInfo.c
        clients/odbc/driver/SQLPrepare.c
        clients/odbc/driver/SQLPrimaryKeys.c
        clients/odbc/driver/SQLProcedures.c
        clients/odbc/driver/SQLSpecialColumns.c
        clients/odbc/driver/SQLStatistics.c
        clients/odbc/driver/SQLTablePrivileges.c
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        clients/python2/setup.py
        clients/python3/setup.py
        common/stream/stream.c
        configure.ag
        debian/control
        gdk/gdk_atoms.c
        gdk/gdk_private.h
        gdk/gdk_system.h
        gdk/gdk_utils.c
        gdk/libbat.rc
        geom/monetdb5/geom.c
        java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
        monetdb5/extras/jaql/jaql.c
        monetdb5/extras/jaql/jaqlscenario.c
        monetdb5/extras/jaql/json.c
        monetdb5/mal/mal_atom.c
        monetdb5/mal/mal_builder.c
        monetdb5/mal/mal_debugger.c
        monetdb5/mal/mal_exception.c
        monetdb5/mal/mal_import.c
        monetdb5/mal/mal_recycle.c
        monetdb5/mal/mal_resource.c
        monetdb5/modules/atoms/xml.c
        monetdb5/modules/mal/tablet.c
        monetdb5/modules/mal/tokenizer.c
        monetdb5/modules/mal/urlbox.c
        monetdb5/optimizer/opt_dataflow.c
        monetdb5/optimizer/opt_dictionary.c
        monetdb5/optimizer/opt_evaluate.c
        monetdb5/optimizer/opt_octopus.c
        monetdb5/optimizer/opt_qep.c
        monetdb5/optimizer/opt_remoteQueries.c
        monetdb5/optimizer/opt_reorder.c
        monetdb5/optimizer/opt_strengthReduction.c
        monetdb5/optimizer/opt_wrapper.c
        monetdb5/scheduler/run_octopus.c
        monetdb5/tools/libmonetdb5.rc
        sql/backends/monet5/LSST/lsst.c
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql_cast.c
        sql/backends/monet5/sql_optimizer.c
        sql/backends/monet5/sql_result.c
        sql/backends/monet5/vaults/fits.c
        sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
        sql/server/rel_dump.c
        sql/test/pg_regress/Tests/strings_cast.stable.err
        sql/test/pg_regress/Tests/strings_cast.stable.out
        sql/test/pg_regress/monetdb/char.sql
        testing/Mtest.py.in
        tools/merovingian/daemon/argvcmds.c
        tools/merovingian/daemon/client.c
        tools/merovingian/daemon/controlrunner.c
        tools/merovingian/daemon/proxy.c
        tools/merovingian/utils/control.c
        tools/merovingian/utils/database.c
        tools/merovingian/utils/properties.c
        tools/merovingian/utils/properties.h
        vertoo.data
Branch: int128
Log Message:

Merged with Jan2014 branch (changeset 473050ca02c7).


diffs (truncated from 22457 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -566,3 +566,6 @@ 242fe4b4960f54c339f7a6fb79aedd8f3b5e217a
 c91c4d792dee1074ce6f489e94ce4bfc480edfb3 Jan2014_15
 13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release
 ccf01c7bd2fb1efd8be98f42129b2d5425dbf5af int128_Jan2014_17
+c3051f066a9eea814487dfb0b7cf7070ae16cd21 Jan2014_17
+13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release
+389f5f0d4c43ab689e31c28e01b43c8b7ba8de9c Jan2014_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.17.17
+%define version 11.17.18
 %{!?buildno: %define buildno %(date +%Y%m%d)}
 
 # groups of related archs
@@ -52,7 +52,7 @@ BuildRequires: bzip2-devel
 # BuildRequires: cfitsio-devel
 BuildRequires: flex
 %if %{?with_geos:1}%{!?with_geos:0}
-BuildRequires: geos-devel >= 2.2.0
+BuildRequires: geos-devel >= 3.0.0
 %endif
 BuildRequires: gsl-devel
 BuildRequires: libcurl-devel
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.17.17"
+        "ProductVersion" = "8:11.17.18"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -432,7 +432,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.17.17"
+        "ProductVersion" = "8:11.17.18"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj 
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -2407,7 +2407,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.17\\dump-restore.txt"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.18\\dump-restore.txt"
             "TargetName" = "8:dump-restore.txt"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3207,7 +3207,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.17\\dump-restore.html"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.18\\dump-restore.html"
             "TargetName" = "8:dump-restore.html"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4511,7 +4511,7 @@
                                 {
                                     
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
                                     {
-                                    "Name" = "8:MonetDB-SQL-11.17.17"
+                                    "Name" = "8:MonetDB-SQL-11.17.18"
                                     "AlwaysCreate" = "11:FALSE"
                                     "Condition" = "8:"
                                     "Transitive" = "11:FALSE"
@@ -4561,7 +4561,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.17.17"
+        "ProductVersion" = "8:11.17.18"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj 
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.17.17"
+        "ProductVersion" = "8:11.17.18"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj 
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -432,7 +432,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.17.17"
+        "ProductVersion" = "8:11.17.18"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj 
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -2407,7 +2407,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.17\\dump-restore.txt"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.18\\dump-restore.txt"
             "TargetName" = "8:dump-restore.txt"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3207,7 +3207,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.17\\dump-restore.html"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.18\\dump-restore.html"
             "TargetName" = "8:dump-restore.html"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4511,7 +4511,7 @@
                                 {
                                     
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
                                     {
-                                    "Name" = "8:MonetDB-SQL-11.17.17"
+                                    "Name" = "8:MonetDB-SQL-11.17.18"
                                     "AlwaysCreate" = "11:FALSE"
                                     "Condition" = "8:"
                                     "Transitive" = "11:FALSE"
@@ -4561,7 +4561,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.17.17"
+        "ProductVersion" = "8:11.17.18"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -763,7 +763,7 @@
 #define MONETDB5_PASSWDHASH "SHA512"
 
 /* Release name or "unreleased" */
-#define MONETDB_RELEASE "Jan2014-SP2"
+#define MONETDB_RELEASE "unreleased"
 
 /* Define if the oid type should use 32 bits on a 64-bit architecture */
 /* #undef MONET_OID32 */
@@ -784,13 +784,13 @@
 #define PACKAGE_NAME "MonetDB"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.17.17"
+#define PACKAGE_STRING "MonetDB 11.17.18"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "MonetDB"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "11.17.17"
+#define PACKAGE_VERSION "11.17.18"
 
 /* Define to the home page for this package. */
 #define PACKAGE_URL ""
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -17,7 +17,7 @@
 # Copyright August 2008-2014 MonetDB B.V.
 # All Rights Reserved.
 
-VERSION=11.17.17
+VERSION=11.17.18
 #       ^^^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact [email protected] for details and/or 
assistance.
diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014
--- a/buildtools/ChangeLog.Jan2014
+++ b/buildtools/ChangeLog.Jan2014
@@ -1,3 +1,8 @@
 # ChangeLog file for buildtools
 # This file is updated with Maddlog
 
+* Tue Jun  3 2014 Sjoerd Mullender <[email protected]>
+- Fix configure to continue without Python if the python binary is
+  too old.  This instead of always aborting configure if python happens
+  to be too old.
+
diff --git a/clients/R/MonetDB.R/src/mapi.c b/clients/R/MonetDB.R/src/mapi.c
--- a/clients/R/MonetDB.R/src/mapi.c
+++ b/clients/R/MonetDB.R/src/mapi.c
@@ -257,8 +257,8 @@ SEXP mapiRead(SEXP conn) {
                while (response_buf_offset + block_length > response_buf_len) {
                        response_buf_len += ALLOCSIZE;
                        if (DEBUG) {
-                               printf("II: Reallocating memory, new size 
%lu\n",
-                                               (unsigned long) 
response_buf_len);
+                               printf("II: Reallocating memory, new size 
"SZFMT"\n",
+                                               response_buf_len);
                        }
                        response_buf = realloc(response_buf, response_buf_len);
                        if (response_buf == NULL) {
@@ -278,7 +278,7 @@ SEXP mapiRead(SEXP conn) {
        size_t i;
        for (i = 0; i < response_buf_offset; i++) {
                if (response_buf[i] == '\0') {
-                       warning("Removed a NULL character from response at 
offset %lu of %lu",(unsigned long) i,(unsigned long) response_buf_offset);
+                       warning("Removed a NULL character from response at 
offset "SZFMT" of "SZFMT"",i,response_buf_offset);
                        response_buf[i] = '\t';
                }
        }
diff --git a/clients/mapiclient/ReadlineTools.c 
b/clients/mapiclient/ReadlineTools.c
--- a/clients/mapiclient/ReadlineTools.c
+++ b/clients/mapiclient/ReadlineTools.c
@@ -92,8 +92,9 @@ sql_tablename_generator(const char *text
        while (seekpos < rowcount) {
                const char *name;
 
-               mapi_seek_row(table_hdl, seekpos++, MAPI_SEEK_SET);
-               mapi_fetch_row(table_hdl);
+               if (mapi_seek_row(table_hdl, seekpos++, MAPI_SEEK_SET) != MOK ||
+                   mapi_fetch_row(table_hdl) <= 0)
+                       continue;
                name = mapi_fetch_field(table_hdl, 0);
                if (strncmp(name, text, len) == 0) {
                        char *s;
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -1942,8 +1942,6 @@ dump_database(Mapi mid, stream *toConsol
        return rc;
 
   bailout:
-       if( curschema )
-               free(curschema);
        if (hdl) {
                if (mapi_result_error(hdl))
                        mapi_explain_result(hdl, stderr);
@@ -1954,6 +1952,8 @@ dump_database(Mapi mid, stream *toConsol
                mapi_explain(mid, stderr);
 
   bailout2:
+       if (curschema)
+               free(curschema);
        hdl = mapi_query(mid, end);
        if (hdl)
                mapi_close_handle(hdl);
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2023,7 +2023,6 @@ doFile(Mapi mid, const char *file, int u
                        /* test for special commands */
                        if (mode != MAL)
                                while (length > 0 &&
-                                      (*line & ~0x7F) == 0 &&
                                       isascii((int) *line) &&
                                       isspace((int) *line)) {
                                        line++;
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1106,7 +1106,10 @@ showcolormap(char *filename, int all)
        if (all) {
                snprintf(buf, BUFSIZ, "%s.gpl", filename);
                f = fopen(buf, "w");
-               assert(f);
+               if (f == NULL) {
+                       fprintf(stderr, "Creating file %s.gpl failed\n", 
filename);
+                       exit(1);
+               }
                fprintf(f, "set terminal pdfcairo noenhanced color solid size 
8.3, 11.7\n");
                fprintf(f, "set output \"%s.pdf\"\n", filename);
                fprintf(f, "set size 1,1\n");
@@ -1237,6 +1240,10 @@ showcolormap(char *filename, int all)
        fprintf(f, "\" at %d,%d\n",
                (int) (0.2 * w), h - 35);
        fprintf(f, "plot 0 notitle with lines linecolor rgb \"white\"\n");
+       if (all) {
+               assert(f != gnudata);
+               fclose(f);
+       }
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to