Changeset: c1af2fbd1dc8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c1af2fbd1dc8
Modified Files:
sql/server/rel_dump.c
Branch: Dec2016
Log Message:
Resolve compilation error on Windows and Sol-Solaris
.\..\..\..\sql\server\rel_dump.c(606): error #118: a void function may not
return a value
return skipIdent(r, pos);
diffs (30 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -602,15 +602,17 @@ skipIdent( char *r, int *pos)
static void
skipIdentOrSymbol( char *r, int *pos)
{
- if (r[*pos] == '"')
- return skipIdent(r, pos);
- while(r[*pos] && (isalnum(r[*pos]) ||
- r[*pos] == '_' || r[*pos] == '%' ||
- r[*pos] == '<' || r[*pos] == '>' ||
- r[*pos] == '/' || r[*pos] == '*' ||
- r[*pos] == '-' || r[*pos] == '+' ||
- r[*pos] == '~' || r[*pos] == '^' ))
- (*pos)++;
+ if (r[*pos] == '"') {
+ skipIdent(r, pos);
+ } else {
+ while(r[*pos] && (isalnum(r[*pos]) ||
+ r[*pos] == '_' || r[*pos] == '%' ||
+ r[*pos] == '<' || r[*pos] == '>' ||
+ r[*pos] == '/' || r[*pos] == '*' ||
+ r[*pos] == '-' || r[*pos] == '+' ||
+ r[*pos] == '~' || r[*pos] == '^' ))
+ (*pos)++;
+ }
}
static int
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
