Changeset: 5b19c66e26aa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5b19c66e26aa
Modified Files:
sql/backends/monet5/sql.c
Branch: default
Log Message:
No need to change argument string + be consistent.
diffs (29 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -3086,7 +3086,7 @@ mvc_import_table_wrap(Client cntxt, MalB
lng sz = *getArgReference_lng(stk, pci, pci->retc + 6);
lng offset = *getArgReference_lng(stk, pci, pci->retc + 7);
int besteffort = *getArgReference_int(stk, pci, pci->retc + 8);
- char *fixed_widths = *getArgReference_str(stk, pci, pci->retc + 9);
+ const char *fixed_widths = *getArgReference_str(stk, pci, pci->retc +
9);
int onclient = *getArgReference_int(stk, pci, pci->retc + 10);
bool escape = *getArgReference_int(stk, pci, pci->retc + 11);
str msg = MAL_SUCCEED;
@@ -3157,7 +3157,7 @@ mvc_import_table_wrap(Client cntxt, MalB
stream *ns;
for (i = 0; i < width_len; i++) {
- if (fixed_widths[i] == '|') {
+ if (fixed_widths[i] == STREAM_FWF_FIELD_SEP) {
ncol++;
}
}
@@ -3168,7 +3168,6 @@ mvc_import_table_wrap(Client cntxt, MalB
}
for (i = 0; i < width_len; i++) {
if (fixed_widths[i] == STREAM_FWF_FIELD_SEP) {
- fixed_widths[i] = '\0';
widths[current_width_entry++] =
(size_t) strtoll(val_start, NULL, 10);
val_start = fixed_widths + i + 1;
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
