Merge pull request #288 from bence98/master

bbonev · web-flow · commit aa49f5cc7e39 · 2024-09-14T15:55:21.000+03:00
udev-rules: Fix compile errors with `-DDEBUG=1`
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
@@ -326,8 +326,8 @@ static void dump_token(struct udev_rules *rules, struct token *token) {
         enum token_type type = token->type;
         enum operation_type op = token->key.op;
         enum string_glob_type glob = token->key.glob;
-        const char *value = str(rules, token->key.value_off);
-        const char *attr = &rules->buf[token->key.attr_off];
+        const char *value = rules_str(rules, token->key.value_off);
+        const char *attr = rules_str(rules, token->key.attr_off);
 
         switch (type) {
         case TK_RULE:
@@ -337,9 +337,9 @@ static void dump_token(struct udev_rules *rules, struct token *token) {
                         unsigned int idx = (tk_ptr - tks_ptr) / sizeof(struct token);
 
                         log_debug("* RULE %s:%u, token: %u, count: %u, label: '%s'",
-                                  &rules->buf[token->rule.filename_off], token->rule.filename_line,
+                                  rules_str(rules, token->rule.filename_off), token->rule.filename_line,
                                   idx, token->rule.token_count,
-                                  &rules->buf[token->rule.label_off]);
+                                  rules_str(rules, token->rule.label_off));
                         break;
                 }
         case TK_M_ACTION:
@@ -436,11 +436,11 @@ static void dump_token(struct udev_rules *rules, struct token *token) {
 static void dump_rules(struct udev_rules *rules) {
         unsigned int i;
 
-        log_debug("dumping %u (%zu bytes) tokens, %u (%zu bytes) strings",
+        log_debug("dumping %u tokens (%zu bytes), %zu strings (%zu bytes)",
                   rules->token_cur,
                   rules->token_cur * sizeof(struct token),
-                  rules->buf_count,
-                  rules->buf_cur);
+                  rules->strbuf->in_count,
+                  rules->strbuf->in_len);
         for (i = 0; i < rules->token_cur; i++)
                 dump_token(rules, &rules->tokens[i]);
 }

Original file line number	Original file line	Diff line number	Diff line change
`@@ -326,8 +326,8 @@ static void dump_token(struct udev_rules rules, struct token token) {`
`326`	`enum token_type type = token->type;`	`326`	`enum token_type type = token->type;`
`327`	`enum operation_type op = token->key.op;`	`327`	`enum operation_type op = token->key.op;`
`328`	`enum string_glob_type glob = token->key.glob;`	`328`	`enum string_glob_type glob = token->key.glob;`
`329`	`- const char *value = str(rules, token->key.value_off);`	`329`	`+ const char *value = rules_str(rules, token->key.value_off);`
`330`	`- const char *attr = &rules->buf[token->key.attr_off];`	`330`	`+ const char *attr = rules_str(rules, token->key.attr_off);`
`331`		`331`
`332`	`switch (type) {`	`332`	`switch (type) {`
`333`	`case TK_RULE:`	`333`	`case TK_RULE:`
`@@ -337,9 +337,9 @@ static void dump_token(struct udev_rules rules, struct token token) {`
`337`	`unsigned int idx = (tk_ptr - tks_ptr) / sizeof(struct token);`	`337`	`unsigned int idx = (tk_ptr - tks_ptr) / sizeof(struct token);`
`338`		`338`
`339`	`log_debug("* RULE %s:%u, token: %u, count: %u, label: '%s'",`	`339`	`log_debug("* RULE %s:%u, token: %u, count: %u, label: '%s'",`
`340`	`- &rules->buf[token->rule.filename_off], token->rule.filename_line,`	`340`	`+ rules_str(rules, token->rule.filename_off), token->rule.filename_line,`
`341`	`idx, token->rule.token_count,`	`341`	`idx, token->rule.token_count,`
`342`	`- &rules->buf[token->rule.label_off]);`	`342`	`+ rules_str(rules, token->rule.label_off));`
`343`	`break;`	`343`	`break;`
`344`	`}`	`344`	`}`
`345`	`case TK_M_ACTION:`	`345`	`case TK_M_ACTION:`
`@@ -436,11 +436,11 @@ static void dump_token(struct udev_rules rules, struct token token) {`
`436`	`static void dump_rules(struct udev_rules *rules) {`	`436`	`static void dump_rules(struct udev_rules *rules) {`
`437`	`unsigned int i;`	`437`	`unsigned int i;`
`438`		`438`
`439`	`- log_debug("dumping %u (%zu bytes) tokens, %u (%zu bytes) strings",`	`439`	`+ log_debug("dumping %u tokens (%zu bytes), %zu strings (%zu bytes)",`
`440`	`rules->token_cur,`	`440`	`rules->token_cur,`
`441`	`rules->token_cur * sizeof(struct token),`	`441`	`rules->token_cur * sizeof(struct token),`
`442`	`- rules->buf_count,`	`442`	`+ rules->strbuf->in_count,`
`443`	`- rules->buf_cur);`	`443`	`+ rules->strbuf->in_len);`
`444`	`for (i = 0; i < rules->token_cur; i++)`	`444`	`for (i = 0; i < rules->token_cur; i++)`
`445`	`dump_token(rules, &rules->tokens[i]);`	`445`	`dump_token(rules, &rules->tokens[i]);`
`446`	`}`	`446`	`}`