emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: style fixes. no code changes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-12-15 12:39:25 +01:00
parent 454fe29a80
commit d6f5000c13
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archival/lzop.c
View File

@ -201,7 +201,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
/* remove short run */ /* remove short run */
*litp &= ~3; *litp &= ~3;
/* copy over the 2 literals that replace the match */ /* 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 */ /* move literals 1 byte ahead */
litp += 2; litp += 2;
if (lit > 0) if (lit > 0)
@ -211,7 +211,8 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
*litp = (unsigned char)(lit - 3); *litp = (unsigned char)(lit - 3);
o_m1_b++; o_m1_b++;
*op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos++;
*op++ = *m_pos++;
goto copy_literal_run; goto copy_literal_run;
} }
copy_m1: copy_m1:
@ -240,7 +241,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
) { ) {
t = *ip++; t = *ip++;
/* copy over the 3 literals that replace the match */ /* 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 */ /* set new length of previous literal run */
lit += 3 + t + 3; lit += 3 + t + 3;
*litp = (unsigned char)(lit - 3); *litp = (unsigned char)(lit - 3);
@ -289,7 +290,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
lit += 3; lit += 3;
*litp = (unsigned char)((*litp & ~3) | lit); *litp = (unsigned char)((*litp & ~3) | lit);
/* copy over the 3 literals that replace the match */ /* 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++; o_m3_a++;
} }
/* test if a literal run follows */ /* test if a literal run follows */
@ -300,7 +301,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
/* remove short run */ /* remove short run */
*litp &= ~3; *litp &= ~3;
/* copy over the 3 literals that replace the match */ /* 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 */ /* move literals 1 byte ahead */
litp += 2; litp += 2;
if (lit > 0) if (lit > 0)

4
networking/ifupdown.c
View File

@ -1312,8 +1312,8 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
llist_t *iface_state = find_iface_state(state_list, iface); llist_t *iface_state = find_iface_state(state_list, iface);
if (cmds == iface_up && !any_failures) { if (cmds == iface_up && !any_failures) {
char * const newiface = xasprintf("%s=%s", iface, liface); char *newiface = xasprintf("%s=%s", iface, liface);
if (iface_state == NULL) { if (!iface_state) {
llist_add_to_end(&state_list, newiface); llist_add_to_end(&state_list, newiface);
} else { } else {
free(iface_state->data); free(iface_state->data);

4
util-linux/rdev.c
View File

@ -23,9 +23,9 @@
int rdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int rdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int rdev_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) 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); printf("%s /\n", root_device);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }