aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-12-15 12:39:25 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2011-12-15 12:39:25 +0100
commitd6f5000c1303ca7c31759d380fe154a46bd7126b (patch)
tree8a67c768d3a94b33ce963576fc2c3f2e318afb90
parent454fe29a802f5f32b802df1a54324946d0b87669 (diff)
downloadbusybox-w32-d6f5000c1303ca7c31759d380fe154a46bd7126b.tar.gz
busybox-w32-d6f5000c1303ca7c31759d380fe154a46bd7126b.tar.bz2
busybox-w32-d6f5000c1303ca7c31759d380fe154a46bd7126b.zip
*: style fixes. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/lzop.c11
-rw-r--r--networking/ifupdown.c4
-rw-r--r--util-linux/rdev.c4
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,
201 /* remove short run */ 201 /* remove short run */
202 *litp &= ~3; 202 *litp &= ~3;
203 /* copy over the 2 literals that replace the match */ 203 /* copy over the 2 literals that replace the match */
204 copy2(ip-3+1,m_pos,pd(op,m_pos)); 204 copy2(ip-3+1, m_pos, pd(op, m_pos));
205 /* move literals 1 byte ahead */ 205 /* move literals 1 byte ahead */
206 litp += 2; 206 litp += 2;
207 if (lit > 0) 207 if (lit > 0)
@@ -211,7 +211,8 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
211 *litp = (unsigned char)(lit - 3); 211 *litp = (unsigned char)(lit - 3);
212 212
213 o_m1_b++; 213 o_m1_b++;
214 *op++ = *m_pos++; *op++ = *m_pos++; 214 *op++ = *m_pos++;
215 *op++ = *m_pos++;
215 goto copy_literal_run; 216 goto copy_literal_run;
216 } 217 }
217 copy_m1: 218 copy_m1:
@@ -240,7 +241,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
240 ) { 241 ) {
241 t = *ip++; 242 t = *ip++;
242 /* copy over the 3 literals that replace the match */ 243 /* copy over the 3 literals that replace the match */
243 copy3(ip-1-2,m_pos,pd(op,m_pos)); 244 copy3(ip-1-2, m_pos, pd(op, m_pos));
244 /* set new length of previous literal run */ 245 /* set new length of previous literal run */
245 lit += 3 + t + 3; 246 lit += 3 + t + 3;
246 *litp = (unsigned char)(lit - 3); 247 *litp = (unsigned char)(lit - 3);
@@ -289,7 +290,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
289 lit += 3; 290 lit += 3;
290 *litp = (unsigned char)((*litp & ~3) | lit); 291 *litp = (unsigned char)((*litp & ~3) | lit);
291 /* copy over the 3 literals that replace the match */ 292 /* copy over the 3 literals that replace the match */
292 copy3(ip-3,m_pos,pd(op,m_pos)); 293 copy3(ip-3, m_pos, pd(op, m_pos));
293 o_m3_a++; 294 o_m3_a++;
294 } 295 }
295 /* test if a literal run follows */ 296 /* test if a literal run follows */
@@ -300,7 +301,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
300 /* remove short run */ 301 /* remove short run */
301 *litp &= ~3; 302 *litp &= ~3;
302 /* copy over the 3 literals that replace the match */ 303 /* copy over the 3 literals that replace the match */
303 copy3(ip-4+1,m_pos,pd(op,m_pos)); 304 copy3(ip-4+1, m_pos, pd(op, m_pos));
304 /* move literals 1 byte ahead */ 305 /* move literals 1 byte ahead */
305 litp += 2; 306 litp += 2;
306 if (lit > 0) 307 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)
1312 llist_t *iface_state = find_iface_state(state_list, iface); 1312 llist_t *iface_state = find_iface_state(state_list, iface);
1313 1313
1314 if (cmds == iface_up && !any_failures) { 1314 if (cmds == iface_up && !any_failures) {
1315 char * const newiface = xasprintf("%s=%s", iface, liface); 1315 char *newiface = xasprintf("%s=%s", iface, liface);
1316 if (iface_state == NULL) { 1316 if (!iface_state) {
1317 llist_add_to_end(&state_list, newiface); 1317 llist_add_to_end(&state_list, newiface);
1318 } else { 1318 } else {
1319 free(iface_state->data); 1319 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 @@
23int rdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 23int rdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
24int rdev_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) 24int rdev_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
25{ 25{
26 char const * const root_device = find_block_device("/"); 26 const char *root_device = find_block_device("/");
27 27
28 if (root_device != NULL) { 28 if (root_device) {
29 printf("%s /\n", root_device); 29 printf("%s /\n", root_device);
30 return EXIT_SUCCESS; 30 return EXIT_SUCCESS;
31 } 31 }