From: Karel Zak <kzak@redhat.com>
Date: Tue, 6 Jun 2023 08:45:17 +0000 (+0200)
Subject: Merge branch 'lsfd--timerfd' of https://github.com/masatake/util-linux
X-Git-Tag: v2.40-rc1~403
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00f254a8f084d3dcd59d1b3ea0b68642090ecf6a;p=thirdparty%2Futil-linux.git

Merge branch 'lsfd--timerfd' of https://github.com/masatake/util-linux

* 'lsfd--timerfd' of https://github.com/masatake/util-linux:
  tests: (lsfd/filter) add a case for comparing floating point numbers
  tests: (lsfd) add a case for testing timerfd related columns
  tests: add ts_skip_capability
  tests: (mkfds) add a factory to make a timerfd
  lsfd.1.adoc: write about timerfd
  lsfd: print the detail of the timer associated with a timerfd
  lsfd: (filter) accept floating point numbers in expressions
  lsfd: (filter) support floating point number used in columns
  lsfd: (filter) reduce duplicated code in macro definitions
  lsfd: (filter) improve error message
  lsfd.1.adoc: revise type names for columns
  lsfd.1.adoc: fix typos
  lsfd: adjust coding style
  lsfd: fix a sentence in comment
---

00f254a8f084d3dcd59d1b3ea0b68642090ecf6a
diff --cc misc-utils/lsfd-filter.c
index 53be907ac8,cabcb4ae10..919f607e84
--- a/misc-utils/lsfd-filter.c
+++ b/misc-utils/lsfd-filter.c
@@@ -1224,10 -1326,10 +1326,10 @@@ static bool op2_check_type_eq_or_bool_o
  	return op2_check_type_boolean_or_op(parser, op2_class, left, right);
  }
  
 -static bool op2_check_type_num(struct parser* parser, struct op2_class *op2_class,
 +static bool op2_check_type_num(struct parser* parser, const struct op2_class *op2_class,
  			       struct node *left, struct node *right)
  {
- 	if (left->type != NODE_NUM) {
+ 	if (left->type != NODE_NUM && left->type != NODE_FNUM) {
  		snprintf(parser->errmsg, sizeof(parser->errmsg),
  			 _("error: unexpected left operand type %s for: %s"),
  			 NODE_CLASS(left)->name,