diff options
| -rw-r--r-- | archival/lzop.c | 11 | ||||
| -rw-r--r-- | networking/ifupdown.c | 4 | ||||
| -rw-r--r-- | util-linux/rdev.c | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/archival/lzop.c b/archival/lzop.c index 7e30091d9..67baeff7e 100644 --- a/archival/lzop.c +++ b/archival/lzop.c @@ -201,7 +201,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, /* remove short run */ *litp &= ~3; /* copy over the 2 literals that replace the match */ - copy2(ip-3+1,m_pos,pd(op,m_pos)); + copy2(ip-3+1, m_pos, pd(op, m_pos)); /* move literals 1 byte ahead */ litp += 2; if (lit > 0) @@ -211,7 +211,8 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, *litp = (unsigned char)(lit - 3); o_m1_b++; - *op++ = *m_pos++; *op++ = *m_pos++; + *op++ = *m_pos++; + *op++ = *m_pos++; goto copy_literal_run; } copy_m1: @@ -240,7 +241,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, ) { t = *ip++; /* copy over the 3 literals that replace the match */ - copy3(ip-1-2,m_pos,pd(op,m_pos)); + copy3(ip-1-2, m_pos, pd(op, m_pos)); /* set new length of previous literal run */ lit += 3 + t + 3; *litp = (unsigned char)(lit - 3); @@ -289,7 +290,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, lit += 3; *litp = (unsigned char)((*litp & ~3) | lit); /* copy over the 3 literals that replace the match */ - copy3(ip-3,m_pos,pd(op,m_pos)); + copy3(ip-3, m_pos, pd(op, m_pos)); o_m3_a++; } /* test if a literal run follows */ @@ -300,7 +301,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, /* remove short run */ *litp &= ~3; /* copy over the 3 literals that replace the match */ - copy3(ip-4+1,m_pos,pd(op,m_pos)); + copy3(ip-4+1, m_pos, pd(op, m_pos)); /* move literals 1 byte ahead */ litp += 2; if (lit > 0) diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 9c2cad231..73da26085 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c @@ -1312,8 +1312,8 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv) llist_t *iface_state = find_iface_state(state_list, iface); if (cmds == iface_up && !any_failures) { - char * const newiface = xasprintf("%s=%s", iface, liface); - if (iface_state == NULL) { + char *newiface = xasprintf("%s=%s", iface, liface); + if (!iface_state) { llist_add_to_end(&state_list, newiface); } else { free(iface_state->data); diff --git a/util-linux/rdev.c b/util-linux/rdev.c index 1212f841e..465281756 100644 --- a/util-linux/rdev.c +++ b/util-linux/rdev.c @@ -23,9 +23,9 @@ int rdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int rdev_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) { - char const * const root_device = find_block_device("/"); + const char *root_device = find_block_device("/"); - if (root_device != NULL) { + if (root_device) { printf("%s /\n", root_device); return EXIT_SUCCESS; } |