Changeset: 576887de9ab0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/576887de9ab0
Modified Files:
sql/server/sql_semantic.c
Branch: Dec2025
Log Message:
Use a better way of doing nothing.
diffs (48 lines):
diff --git a/sql/server/sql_semantic.c b/sql/server/sql_semantic.c
--- a/sql/server/sql_semantic.c
+++ b/sql/server/sql_semantic.c
@@ -112,7 +112,7 @@ tmp_schema(mvc *sql)
return mvc_bind_schema(sql, "tmp");
}
-#define DO_NOTHING(x) ;
+#define DO_NOTHING(x) ((void) 0)
/* as we don't have OOP in C, I prefer a single macro with the search path
algorithm to passing function pointers */
#define search_object_on_path(CALL, EXTRA_CONDITION, EXTRA, ERROR_CODE,
show_error) \
@@ -182,7 +182,7 @@ find_sequence_on_scope(mvc *sql, const c
static const char objstr[] = "sequence";
sql_sequence *res = NULL;
- search_object_on_path(res = find_sql_sequence(sql->session->tr, next,
name), DO_NOTHING, ;, SQLSTATE(42000), true);
+ search_object_on_path(res = find_sql_sequence(sql->session->tr, next,
name), DO_NOTHING, ((void) 0), SQLSTATE(42000), true);
return res;
}
@@ -192,7 +192,7 @@ find_idx_on_scope(mvc *sql, const char *
static const char objstr[] = "index";
sql_idx *res = NULL;
- search_object_on_path(res = mvc_bind_idx(sql, next, name), DO_NOTHING,
;, SQLSTATE(42S12), true);
+ search_object_on_path(res = mvc_bind_idx(sql, next, name), DO_NOTHING,
((void) 0), SQLSTATE(42S12), true);
return res;
}
@@ -202,7 +202,7 @@ find_type_on_scope(mvc *sql, const char
static const char objstr[] = "type";
sql_type *res = NULL;
- search_object_on_path(res = schema_bind_type(sql, next, name),
DO_NOTHING, ;, SQLSTATE(42S01), true);
+ search_object_on_path(res = schema_bind_type(sql, next, name),
DO_NOTHING, ((void) 0), SQLSTATE(42S01), true);
return res;
}
@@ -212,7 +212,7 @@ find_trigger_on_scope(mvc *sql, const ch
static const char objstr[] = "trigger";
sql_trigger *res = NULL;
- search_object_on_path(res = mvc_bind_trigger(sql, next, name),
DO_NOTHING, ;, SQLSTATE(3F000), true);
+ search_object_on_path(res = mvc_bind_trigger(sql, next, name),
DO_NOTHING, ((void) 0), SQLSTATE(3F000), true);
return res;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
