Changeset: 6fbe96d100f2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6fbe96d100f2 Modified Files: clients/examples/C/smack00.c clients/examples/C/smack01.c clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/mclient.c clients/mapiclient/stethoscope.c clients/odbc/winsetup/install.c clients/odbc/winsetup/resource.h clients/odbc/winsetup/setup.c common/utils/msabaoth.c ctest/tools/monetdbe/backup.c ctest/tools/monetdbe/example_backup.c gdk/gdk_aggr.c gdk/gdk_imprints.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_logger_old.c gdk/gdk_storage.c gdk/gdk_subquery.c gdk/gdk_tracer.c geom/lib/libgeom.c geom/lib/libgeom.h geom/monetdb5/geom.c geom/monetdb5/geom.h monetdb5/extras/rapi/converters.c.h monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_builder.c monetdb5/mal/mal_builder.h monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_errors.h monetdb5/mal/mal_exception.h monetdb5/mal/mal_function.c monetdb5/mal/mal_import.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_module.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_prelude.c monetdb5/mal/mal_resolve.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_runtime.c monetdb5/mal/mal_scenario.c monetdb5/mal/mal_session.c monetdb5/mal/mal_stack.c monetdb5/mal/mel.h monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/color.c monetdb5/modules/atoms/identifier.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/streams.c monetdb5/modules/atoms/url.c monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/xml.c monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/alarm.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/groupby.c monetdb5/modules/mal/json_util.c monetdb5/modules/mal/language.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/projectionpath.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/sample.c monetdb5/modules/mal/sample.h monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tokenizer.c monetdb5/modules/mal/tokenizer.h monetdb5/modules/mal/tracer.c monetdb5/modules/mal/tracer.h monetdb5/modules/mal/wlc.c monetdb5/optimizer/opt_aliases.c monetdb5/optimizer/opt_candidates.c monetdb5/optimizer/opt_coercion.c monetdb5/optimizer/opt_commonTerms.c monetdb5/optimizer/opt_constants.c monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_inline.c monetdb5/optimizer/opt_jit.c monetdb5/optimizer/opt_json.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_matpack.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_oltp.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_postfix.c monetdb5/optimizer/opt_profiler.c monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_querylog.c monetdb5/optimizer/opt_reduce.c monetdb5/optimizer/opt_remap.c monetdb5/optimizer/opt_remoteQueries.c monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_volcano.c monetdb5/optimizer/opt_wlc.c monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.c monetdb5/scheduler/run_memo.c sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/capi/cheader.text.h sql/backends/monet5/UDF/pyapi3/convert_loops.h sql/backends/monet5/UDF/pyapi3/emit3.c sql/backends/monet5/UDF/pyapi3/pyapi3.c sql/backends/monet5/UDF/pyapi3/pyloader3.c sql/backends/monet5/UDF/pyapi3/type_conversion3.c sql/backends/monet5/generator/generator.c sql/backends/monet5/generator/generator.h sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_round_impl.h sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_subquery.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/backends/monet5/vaults/fits/fits.c sql/backends/monet5/vaults/netcdf/netcdf.c sql/backends/monet5/vaults/shp/shp.c sql/backends/monet5/wlr.c sql/common/sql_backend.c sql/common/sql_changeset.c sql/common/sql_hash.c sql/common/sql_list.c sql/common/sql_mem.c sql/common/sql_stack.c sql/common/sql_string.c sql/common/sql_types.c sql/include/sql_catalog.h sql/include/sql_hash.h sql/include/sql_keyword.h sql/include/sql_list.h sql/include/sql_relation.h sql/include/sql_stack.h sql/server/rel_distribute.c sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_outer_join_optimizer.h sql/server/rel_partition.c sql/server/rel_planner.c sql/server/rel_prop.h sql/server/rel_propagate.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_remote.c sql/server/rel_rewriter.c sql/server/rel_rewriter.h sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_semantic.c sql/server/rel_unnest.c sql/server/rel_updates.c sql/server/rel_xml.c sql/server/rel_xml.h sql/server/sql_atom.c sql/server/sql_datetime.c sql/server/sql_datetime.h sql/server/sql_decimal.c sql/server/sql_env.c sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_partition.c sql/server/sql_qc.c sql/server/sql_query.c sql/server/sql_query.h sql/server/sql_scan.c sql/server/sql_semantic.c sql/server/sql_semantic.h sql/server/sql_symbol.c sql/server/sql_var.c sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_storage.h sql/storage/bat/bat_table.c sql/storage/bat/bat_utils.c sql/storage/bat/bat_utils.h sql/storage/bat/res_table.c sql/storage/sql_catalog.c sql/storage/sql_storage.h sql/storage/store.c sql/storage/store_dependency.c sql/storage/store_sequence.c sql/storage/store_sequence.h tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/multiplex-funnel.c tools/merovingian/daemon/proxy.c tools/monetdbe/monetdbe.c tools/monetdbe/monetdbe.h tools/monetdbe/monetdbe_mapi.c tools/mserver/mserver5.c tools/mserver/shutdowntest.c unistd.h.in Branch: unlock Log Message:
cleanup the white space diffs (truncated from 25304 to 300 lines): diff --git a/clients/examples/C/smack00.c b/clients/examples/C/smack00.c --- a/clients/examples/C/smack00.c +++ b/clients/examples/C/smack00.c @@ -44,7 +44,7 @@ main(int argc, char **argv) } if (argc == 3) { l = argv[2]; - if (strcmp(argv[2], "sql") == 0) + if (strcmp(argv[2], "sql") == 0) lang = 1; else if (strcmp(argv[2], "mal") == 0) lang = 3; diff --git a/clients/examples/C/smack01.c b/clients/examples/C/smack01.c --- a/clients/examples/C/smack01.c +++ b/clients/examples/C/smack01.c @@ -43,7 +43,7 @@ main(int argc, char **argv) } if (argc == 3) { l = argv[2]; - if (strcmp(argv[2], "sql") == 0) + if (strcmp(argv[2], "sql") == 0) lang = 1; else if (strcmp(argv[2], "mal") == 0) lang = 3; diff --git a/clients/mapiclient/eventparser.c b/clients/mapiclient/eventparser.c --- a/clients/mapiclient/eventparser.c +++ b/clients/mapiclient/eventparser.c @@ -20,19 +20,19 @@ int debug=0; static void resetEventRecord(EventRecord *ev) { int i; - + FREE(ev->version); // event state FREE(ev->version); - FREE(ev->user); + FREE(ev->user); FREE(ev->session); FREE(ev->function); FREE(ev->module); FREE(ev->instruction); FREE(ev->state); FREE(ev->stmt); - FREE(ev->time); + FREE(ev->time); for(i=0; i< ev->maxarg; i++){ FREE(ev->args[i].alias); FREE(ev->args[i].name); @@ -89,7 +89,7 @@ argparser(char *txt, EventRecord *ev){ cnt ++; } } - + /* Allocate the space for their properties */ if(ev->args) free(ev->args); ev->args = (Argrecord*) malloc(cnt * sizeof(Argrecord)); @@ -236,7 +236,7 @@ keyvalueparser(char *txt, EventRecord *e if(strstr(key,"swaps")) { ev->swaps= atol(val); return 0;} if(strstr(key,"nvcsw")) { ev->nvcsw= atol(val); return 0;} - if (strstr(key,"args")) + if (strstr(key,"args")) argparser(val,ev); return 0; } @@ -268,7 +268,7 @@ renderArgs(FILE *fd, EventRecord *ev, in void renderSummary(FILE *fd, EventRecord *ev, char * filter) -{ +{ char *c, *t; (void) filter; fprintf(fd,"%s\t",ev->time); diff --git a/clients/mapiclient/eventparser.h b/clients/mapiclient/eventparser.h --- a/clients/mapiclient/eventparser.h +++ b/clients/mapiclient/eventparser.h @@ -13,7 +13,7 @@ * will collect the tomograph pages for at most 10 SQL queries * For each page a gnuplot file, a data file, and the event trace * are collected for more focussed analysis. - * + * */ #ifndef _EVENT_PARSER_ @@ -71,7 +71,7 @@ typedef struct{ // the break down of a profiler event message typedef struct { char *version; - char *user; + char *user; char *session; char *function; // name of MAL block char *operator; diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c --- a/clients/mapiclient/mclient.c +++ b/clients/mapiclient/mclient.c @@ -2505,7 +2505,7 @@ doFile(Mapi mid, stream *fp, bool useins #endif } else { /* get all object names in current schema */ - char *with_clause = + char *with_clause = ", describe_all_objects AS (\n" " SELECT s.name AS sname,\n" " t.name,\n" diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c --- a/clients/mapiclient/stethoscope.c +++ b/clients/mapiclient/stethoscope.c @@ -13,7 +13,7 @@ * will collect the tomograph pages for at most 10 SQL queries * For each page a gnuplot file, a data file, and the event trace * are collected for more focussed analysis. - * + * */ #include "monetdb_config.h" @@ -313,7 +313,7 @@ main(int argc, char **argv) } while ((e = strchr(response, '\n')) != NULL) { *e = 0; - if(json) + if(json) printf("%s\n", response); else{ if (debug) diff --git a/clients/odbc/winsetup/install.c b/clients/odbc/winsetup/install.c --- a/clients/odbc/winsetup/install.c +++ b/clients/odbc/winsetup/install.c @@ -13,7 +13,7 @@ #ifdef __MINGW32__ #define DLL "-0.dll" -#else +#else #define DLL ".dll" #endif @@ -60,7 +60,7 @@ ProcessSysErrorMessage(DWORD err, const LocalFree(lpMsgBuf); } -int +int CheckIfFileExists(const char *filepath, const char *filename) { char buf[300]; diff --git a/clients/odbc/winsetup/resource.h b/clients/odbc/winsetup/resource.h --- a/clients/odbc/winsetup/resource.h +++ b/clients/odbc/winsetup/resource.h @@ -21,7 +21,7 @@ #define IDC_EDIT_DATABASE 2007 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 2004 diff --git a/clients/odbc/winsetup/setup.c b/clients/odbc/winsetup/setup.c --- a/clients/odbc/winsetup/setup.c +++ b/clients/odbc/winsetup/setup.c @@ -124,7 +124,7 @@ DialogProc(HWND hwndDlg, UINT uMsg, WPAR rcOwner.top + (rcOwner.bottom - rcOwner.top - (rcDlg.bottom - rcDlg.top)) / 2, 0, 0, /* ignores size arguments */ SWP_NOSIZE | SWP_NOZORDER); - + /* fill in text fields */ SetDlgItemText(hwndDlg, IDC_EDIT_DSN, datap->dsn ? datap->dsn : ""); SetDlgItemText(hwndDlg, IDC_EDIT_UID, datap->uid ? datap->uid : ""); diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c --- a/common/utils/msabaoth.c +++ b/common/utils/msabaoth.c @@ -841,7 +841,7 @@ msab_getUplogInfo(sabuplog *ret, const s *ret = *db->uplog; return(NULL); } - + memset(avg10, 0, sizeof(int) * 10); memset(avg30, 0, sizeof(int) * 30); @@ -866,7 +866,7 @@ msab_getUplogInfo(sabuplog *ret, const s ret->lastcrash = start; memmove(&avg10[0], &avg10[1], sizeof(int) * 9); memmove(&avg30[0], &avg30[1], sizeof(int) * 29); - avg10[9] = avg30[29] = ret->crashavg1 = + avg10[9] = avg30[29] = ret->crashavg1 = (start != 0); *p = '\0'; ret->laststart = start = (time_t)atol(data); @@ -1006,19 +1006,19 @@ msab_deserialise(sabdb **ret, char *sdb) lasts = sdb; if ((p = strchr(lasts, ':')) == NULL) { - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "string does not contain a magic: %s", lasts); return(strdup(buf)); } *p++ = '\0'; if (strcmp(lasts, "sabdb") != 0) { - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "string is not a sabdb struct: %s", lasts); return(strdup(buf)); } lasts = p; if ((p = strchr(p, ':')) == NULL) { - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "string does not contain a version number: %s", lasts); return(strdup(buf)); } @@ -1037,14 +1037,14 @@ msab_deserialise(sabdb **ret, char *sdb) * ignore the path information (and set uri to "<unknown>". The * SABdbStarting state never occurs. */ } else if (strcmp(lasts, SABDBVER) != 0) { - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "string has unsupported version: %s", lasts); return(strdup(buf)); } protover = lasts[0]; lasts = p; if ((p = strchr(p, ',')) == NULL) { - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "string does not contain %s: %s", protover == '1' ? "path" : "dbname", lasts); return(strdup(buf)); @@ -1056,7 +1056,7 @@ msab_deserialise(sabdb **ret, char *sdb) } else { lasts = p; if ((p = strchr(p, ',')) == NULL) { - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "string does not contain uri: %s", lasts); return(strdup(buf)); } @@ -1065,7 +1065,7 @@ msab_deserialise(sabdb **ret, char *sdb) } lasts = p; if ((p = strchr(p, ',')) == NULL) { - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "string does not contain locked state: %s", lasts); return(strdup(buf)); } @@ -1073,7 +1073,7 @@ msab_deserialise(sabdb **ret, char *sdb) locked = atoi(lasts); lasts = p; if ((p = strchr(p, ',')) == NULL) { - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "string does not contain state: %s", lasts); return(strdup(buf)); } @@ -1081,7 +1081,7 @@ msab_deserialise(sabdb **ret, char *sdb) state = atoi(lasts); lasts = p; if ((p = strchr(p, ',')) == NULL) { - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "string does not contain scenarios: %s", lasts); return(strdup(buf)); } @@ -1090,7 +1090,7 @@ msab_deserialise(sabdb **ret, char *sdb) lasts = p; if (protover == '1') { if ((p = strchr(p, ',')) == NULL) { - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "string does not contain connections: %s", lasts); return(strdup(buf)); } @@ -1103,7 +1103,7 @@ msab_deserialise(sabdb **ret, char *sdb) if ((p = strchr(p, ',')) == NULL) { free(u); - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "string does not contain startcounter: %s", lasts); return(strdup(buf)); } @@ -1112,7 +1112,7 @@ msab_deserialise(sabdb **ret, char *sdb) lasts = p; if ((p = strchr(p, ',')) == NULL) { free(u); - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "string does not contain stopcounter: %s", lasts); return(strdup(buf)); } _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list