Index: trunk/src/libcschem/integrity.c =================================================================== --- trunk/src/libcschem/integrity.c (revision 10315) +++ trunk/src/libcschem/integrity.c (revision 10316) @@ -43,16 +43,19 @@ static void igy_brk() {} -#define ASSERT(expr, reason) \ +#define ASSERT1(expr, reason, arg1) \ do { \ if (!(expr)) { \ const char *sheetname = sheet->hidlib.loadname; \ - rnd_message(RND_MSG_ERROR, "Integrity violation: " reason " (" #expr ") at " CSCH_IGY_LOC ", sheet: %s; called from: %s\n", sheetname, called_from); \ + rnd_message(RND_MSG_ERROR, "Integrity violation: " reason, arg1); \ + rnd_message(RND_MSG_ERROR, " (" #expr ") at " CSCH_IGY_LOC ", sheet: %s; called from: %s\n", sheetname, called_from); \ igy_brk(); \ res |= 1; \ } \ } while(0) +#define ASSERT(expr, reason) ASSERT1(expr, reason, NULL) + RND_INLINE int igy_cnc_grp(void *parent, csch_cgrp_t *grp, const char *called_from); RND_INLINE int igy_cnc_conn(void *parent, csch_conn_t *c, const char *called_from)