Commit 56b125fcc7d2c91191453415efe60179feae08e8
2012-05-18T18:38:06
rules: reformat AddRule and AddGroup Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83
diff --git a/src/xkbcomp/rules.c b/src/xkbcomp/rules.c
index ce211f9..800edcf 100644
--- a/src/xkbcomp/rules.c
+++ b/src/xkbcomp/rules.c
@@ -1052,42 +1052,45 @@ get_components(struct rules *rules, struct var_defs *defs,
}
static struct rule *
-XkbcRF_AddRule(struct rules *rules)
+add_rule(struct rules *rules)
{
- if (rules->sz_rules<1) {
- rules->sz_rules= 16;
- rules->num_rules= 0;
- rules->rules = calloc(rules->sz_rules, sizeof(*rules->rules));
+ if (rules->sz_rules < 1) {
+ rules->sz_rules = 16;
+ rules->num_rules = 0;
+ rules->rules = calloc(rules->sz_rules, sizeof(*rules->rules));
}
- else if (rules->num_rules>=rules->sz_rules) {
- rules->sz_rules*= 2;
+ else if (rules->num_rules >= rules->sz_rules) {
+ rules->sz_rules *= 2;
rules->rules = realloc(rules->rules,
rules->sz_rules * sizeof(*rules->rules));
}
+
if (!rules->rules) {
- rules->sz_rules= rules->num_rules= 0;
- return NULL;
+ rules->sz_rules = rules->num_rules = 0;
+ return NULL;
}
+
memset(&rules->rules[rules->num_rules], 0, sizeof(*rules->rules));
return &rules->rules[rules->num_rules++];
}
static struct group *
-XkbcRF_AddGroup(struct rules *rules)
+add_group(struct rules *rules)
{
- if (rules->sz_groups<1) {
- rules->sz_groups= 16;
- rules->num_groups= 0;
+ if (rules->sz_groups < 1) {
+ rules->sz_groups = 16;
+ rules->num_groups = 0;
rules->groups = calloc(rules->sz_groups, sizeof(*rules->groups));
}
else if (rules->num_groups >= rules->sz_groups) {
- rules->sz_groups *= 2;
+ rules->sz_groups *= 2;
rules->groups = realloc(rules->groups,
rules->sz_groups * sizeof(*rules->groups));
}
+
if (!rules->groups) {
- rules->sz_groups= rules->num_groups= 0;
- return NULL;
+ rules->sz_groups = rules->num_groups = 0;
+ return NULL;
}
memset(&rules->groups[rules->num_groups], 0, sizeof(*rules->groups));
@@ -1114,12 +1117,14 @@ XkbcRF_LoadRules(FILE *file)
while (input_line_get(file, &line)) {
if (match_line(&line, &mapping, &trule, &tgroup)) {
if (tgroup.number) {
- if ((group= XkbcRF_AddGroup(rules))!=NULL) {
+ group = add_group(rules);
+ if (group != NULL) {
*group= tgroup;
memset(&tgroup, 0, sizeof(tgroup));
}
} else {
- if ((rule= XkbcRF_AddRule(rules))!=NULL) {
+ rule = add_rule(rules);
+ if (rule != NULL) {
*rule= trule;
memset(&trule, 0, sizeof(trule));
}