1 From d2aeb8b63dfcb15161c4dd3e80491c844c3f0581 Mon Sep 17 00:00:00 2001
2 From: "Yann E. MORIN" <yann.morin.1998@free.fr>
3 Date: Sat, 4 Apr 2015 13:47:32 +0200
4 Subject: [PATCH] Revert "udev: rules - modernise add_rule a bit"
6 Initialisers for anonymous unions are unknown to gcc-4.5, which is still
9 See the following build failure, reported by the Buildroot autobuilders:
10 http://autobuild.buildroot.org/results/11e/11ebb926b891862e270b9cb39fd2ed4344b736a8/build-end.log
12 This reverts commit 5cb98078479d93e25099c1cb73fa9c46aa9ccf29.
14 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
15 Cc: Tom Gundersen <teg@jklm.no>
18 - submitted upstream: https://github.com/gentoo/eudev/pull/113
21 src/udev/udev-rules.c | 8 ++++----
22 1 file changed, 4 insertions(+), 4 deletions(-)
24 diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
25 index 5a4792e..3a96c8a 100644
26 --- a/src/udev/udev-rules.c
27 +++ b/src/udev/udev-rules.c
28 @@ -1047,11 +1047,11 @@ static int add_rule(struct udev_rules *rules, char *line,
29 const char *filename, unsigned int filename_off, unsigned int lineno) {
32 - struct rule_tmp rule_tmp = {
34 - .rule.type = TK_RULE,
36 + struct rule_tmp rule_tmp;
38 + memzero(&rule_tmp, sizeof(struct rule_tmp));
39 + rule_tmp.rules = rules;
40 + rule_tmp.rule.type = TK_RULE;
41 /* the offset in the rule is limited to unsigned short */
42 if (filename_off < USHRT_MAX)
43 rule_tmp.rule.rule.filename_off = filename_off;