summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorMike Gilbert <floppymaster@gmail.com>2017-01-10 02:39:05 -0500
committerLuke Shumaker <lukeshu@lukeshu.com>2017-05-06 16:39:36 -0400
commit3384b776817808f01979ce192603d0c901391fd4 (patch)
tree941b7dda05e4a3d4f5d1bfb52122ee0d16ebda05 /src/udev
parent6a2346a433c6ba1e372d270a4b3a5c62f431038a (diff)
build-sys: add check for gperf lookup function signature (#5055)
gperf-3.1 generates lookup functions that take a size_t length parameter instead of unsigned int. Test for this at configure time. Fixes: https://github.com/systemd/systemd/issues/5039
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/net/link-config.h2
-rw-r--r--src/udev/udev-builtin-keyboard.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
index 91cc0357c4..b0d8ceb76a 100644
--- a/src/udev/net/link-config.h
+++ b/src/udev/net/link-config.h
@@ -93,7 +93,7 @@ const char *mac_policy_to_string(MACPolicy p) _const_;
MACPolicy mac_policy_from_string(const char *p) _pure_;
/* gperf lookup function */
-const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, unsigned length);
+const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
int config_parse_mac_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_name_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
index aa10beafb0..09024116f2 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -29,7 +29,7 @@
#include "string-util.h"
#include "udev.h"
-static const struct key *keyboard_lookup_key(const char *str, unsigned len);
+static const struct key *keyboard_lookup_key(const char *str, GPERF_LEN_TYPE len);
#include "keyboard-keys-from-name.h"
static int install_force_release(struct udev_device *dev, const unsigned *release, unsigned release_count) {