diff options
author | Ron Yorston <rmy@pobox.com> | 2015-08-04 09:46:24 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-08-04 09:46:24 +0100 |
commit | 64fde14d12cc5e6182f114ecaf4340ec1854c2f6 (patch) | |
tree | 4d2cabca7865dd74e2344834d89503c534fb502c /util-linux | |
parent | 7aabb625005c642d6a30d6d97b51bf183429152e (diff) | |
parent | 16aa7a73c40ba5dfaabaedb8a5533619cb8b6cb6 (diff) | |
download | busybox-w32-64fde14d12cc5e6182f114ecaf4340ec1854c2f6.tar.gz busybox-w32-64fde14d12cc5e6182f114ecaf4340ec1854c2f6.tar.bz2 busybox-w32-64fde14d12cc5e6182f114ecaf4340ec1854c2f6.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/fbset.c | 8 | ||||
-rw-r--r-- | util-linux/mdev.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c index e9aacce4f..ac0082f70 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c | |||
@@ -349,10 +349,10 @@ static int read_mode_db(struct fb_var_screeninfo *base, const char *fn, | |||
349 | int transp_offset, transp_length; | 349 | int transp_offset, transp_length; |
350 | 350 | ||
351 | sscanf(p, "%d/%d,%d/%d,%d/%d,%d/%d", | 351 | sscanf(p, "%d/%d,%d/%d,%d/%d,%d/%d", |
352 | &red_offset, &red_length, | 352 | &red_length, &red_offset, |
353 | &green_offset, &green_length, | 353 | &green_length, &green_offset, |
354 | &blue_offset, &blue_length, | 354 | &blue_length, &blue_offset, |
355 | &transp_offset, &transp_length); | 355 | &transp_length, &transp_offset); |
356 | base->red.offset = red_offset; | 356 | base->red.offset = red_offset; |
357 | base->red.length = red_length; | 357 | base->red.length = red_length; |
358 | base->red.msb_right = 0; | 358 | base->red.msb_right = 0; |
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index ca4b91510..662e8ab38 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
@@ -471,7 +471,7 @@ static const struct rule *next_rule(void) | |||
471 | if (G.parser) { | 471 | if (G.parser) { |
472 | parse_next_rule(); | 472 | parse_next_rule(); |
473 | if (G.rule_vec) { /* mdev -s */ | 473 | if (G.rule_vec) { /* mdev -s */ |
474 | rule = memcpy(xmalloc(sizeof(G.cur_rule)), &G.cur_rule, sizeof(G.cur_rule)); | 474 | rule = xmemdup(&G.cur_rule, sizeof(G.cur_rule)); |
475 | G.rule_vec = xrealloc_vector(G.rule_vec, 4, G.rule_idx); | 475 | G.rule_vec = xrealloc_vector(G.rule_vec, 4, G.rule_idx); |
476 | G.rule_vec[G.rule_idx++] = rule; | 476 | G.rule_vec[G.rule_idx++] = rule; |
477 | dbg3("> G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]); | 477 | dbg3("> G.rule_vec[G.rule_idx:%d]=%p", G.rule_idx, G.rule_vec[G.rule_idx]); |