git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
util.c
diff --git
a/lib/util.c
b/lib/util.c
index
9f37350
..
984ab45
100644
(file)
--- a/
lib/util.c
+++ b/
lib/util.c
@@
-67,7
+67,7
@@
ovs_assert_failure(const char *where, const char *function,
case 0:
VLOG_ABORT("%s: assertion %s failed in %s()",
where, condition, function);
case 0:
VLOG_ABORT("%s: assertion %s failed in %s()",
where, condition, function);
- NOT_REACHED();
+
OVS_
NOT_REACHED();
case 1:
fprintf(stderr, "%s: assertion %s failed in %s()",
case 1:
fprintf(stderr, "%s: assertion %s failed in %s()",
@@
-1360,7
+1360,7
@@
scan_float(const char *s, const struct scan_spec *spec, va_list *args)
case SCAN_INTMAX_T:
case SCAN_PTRDIFF_T:
case SCAN_SIZE_T:
case SCAN_INTMAX_T:
case SCAN_PTRDIFF_T:
case SCAN_SIZE_T:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
return s;
}
}
return s;
}