Merge branch 'wip/hadess/downgrade-assert-2' into 'master'
Another assert downgrade See merge request libfprint/libfprint!7
This commit is contained in:
commit
28b6f643d8
3 changed files with 11 additions and 5 deletions
|
@ -8,7 +8,7 @@ variables:
|
||||||
|
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
|
- dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES && rpm -Uvh --oldpackage https://kojipkgs.fedoraproject.org//packages/meson/0.46.1/2.fc29/noarch/meson-0.46.1-2.fc29.noarch.rpm
|
||||||
|
|
||||||
|
|
||||||
build:
|
build:
|
||||||
|
|
|
@ -40,10 +40,16 @@
|
||||||
#define fp_dbg g_debug
|
#define fp_dbg g_debug
|
||||||
#define fp_info g_debug
|
#define fp_info g_debug
|
||||||
#define fp_warn g_warning
|
#define fp_warn g_warning
|
||||||
#define fp_err g_error
|
#define fp_err g_warning
|
||||||
|
|
||||||
#define BUG_ON(condition) g_assert(!(condition))
|
#define BUG_ON(condition) G_STMT_START \
|
||||||
#define BUG() g_assert_not_reached()
|
if (condition) { \
|
||||||
|
char *s; \
|
||||||
|
s = g_strconcat ("BUG: (", #condition, ")", NULL); \
|
||||||
|
g_warning ("%s: %s() %s:%d", s, G_STRFUNC, __FILE__, __LINE__); \
|
||||||
|
g_free (s); \
|
||||||
|
} G_STMT_END
|
||||||
|
#define BUG() BUG_ON(1)
|
||||||
|
|
||||||
enum fp_dev_state {
|
enum fp_dev_state {
|
||||||
DEV_STATE_INITIAL = 0,
|
DEV_STATE_INITIAL = 0,
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
#define fp_dbg g_debug
|
#define fp_dbg g_debug
|
||||||
#define fp_info g_debug
|
#define fp_info g_debug
|
||||||
#define fp_warn g_warning
|
#define fp_warn g_warning
|
||||||
#define fp_err g_error
|
#define fp_err g_warning
|
||||||
|
|
||||||
#define BUG_ON(condition) G_STMT_START \
|
#define BUG_ON(condition) G_STMT_START \
|
||||||
if (condition) { \
|
if (condition) { \
|
||||||
|
|
Loading…
Reference in a new issue