aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManinder Singh <maninder1.s@samsung.com>2015-06-10 03:47:27 +0000
committerDenys Vlasenko <vda.linux@googlemail.com>2015-07-13 03:25:46 +0200
commit97f2f7ca7fe10783a592087df989a7f394492fa1 (patch)
tree4d70075a3771a6fb2d06d8cdd3e421474d7ce779
parentb7ee7e1e13fa4a680e8b228bd158e7aa53fe342a (diff)
downloadbusybox-w32-97f2f7ca7fe10783a592087df989a7f394492fa1.tar.gz
busybox-w32-97f2f7ca7fe10783a592087df989a7f394492fa1.tar.bz2
busybox-w32-97f2f7ca7fe10783a592087df989a7f394492fa1.zip
Removes stray empty line from code
This patch removes stray empty line from busybox code reported by script find_stray_empty_lines Signed-off-by: Maninder Singh <maninder1.s@samsung.com> Signed-off-by: Akhilesh Kumar <akhilesh.k@samsung.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/cpio.c1
-rw-r--r--archival/gzip.c3
-rw-r--r--archival/libarchive/bz/compress.c1
-rw-r--r--archival/libarchive/decompress_uncompress.c1
-rw-r--r--archival/libarchive/lzo1x_9x.c1
-rw-r--r--archival/libarchive/unxz/xz_dec_lzma2.c3
-rw-r--r--archival/libarchive/unxz/xz_dec_stream.c2
-rw-r--r--archival/unzip.c2
-rw-r--r--console-tools/showkey.c1
-rw-r--r--coreutils/ln.c1
-rw-r--r--editors/awk.c12
-rw-r--r--editors/ed.c1
-rw-r--r--editors/vi.c1
-rw-r--r--libbb/appletlib.c1
-rw-r--r--libbb/in_ether.c1
-rw-r--r--libbb/procps.c1
-rw-r--r--libbb/xfuncs.c1
-rw-r--r--mailutils/reformime.c1
-rw-r--r--miscutils/crontab.c1
-rw-r--r--networking/arp.c1
-rw-r--r--networking/ntpd.c1
-rw-r--r--networking/tftp.c1
-rw-r--r--networking/wget.c1
-rw-r--r--selinux/setfiles.c1
-rw-r--r--shell/ash.c2
-rw-r--r--shell/hush.c1
-rw-r--r--shell/shell_common.c1
-rw-r--r--sysklogd/syslogd.c1
28 files changed, 0 insertions, 46 deletions
diff --git a/archival/cpio.c b/archival/cpio.c
index 454648d68..cdc16c14e 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -257,7 +257,6 @@ static NOINLINE int cpio_o(void)
257 free(line); 257 free(line);
258 continue; 258 continue;
259 } 259 }
260
261 } else { /* line == NULL: EOF */ 260 } else { /* line == NULL: EOF */
262 next_link: 261 next_link:
263 if (links) { 262 if (links) {
diff --git a/archival/gzip.c b/archival/gzip.c
index 42b2f0b2e..c9171304a 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -1372,7 +1372,6 @@ static void build_tree(tree_desc * desc)
1372 /* and insert the new node in the heap */ 1372 /* and insert the new node in the heap */
1373 G2.heap[SMALLEST] = node++; 1373 G2.heap[SMALLEST] = node++;
1374 pqdownheap(tree, SMALLEST); 1374 pqdownheap(tree, SMALLEST);
1375
1376 } while (G2.heap_len >= 2); 1375 } while (G2.heap_len >= 2);
1377 1376
1378 G2.heap[--G2.heap_max] = G2.heap[SMALLEST]; 1377 G2.heap[--G2.heap_max] = G2.heap[SMALLEST];
@@ -1720,7 +1719,6 @@ static ulg flush_block(char *buf, ulg stored_len, int eof)
1720 1719
1721 copy_block(buf, (unsigned) stored_len, 0); /* without header */ 1720 copy_block(buf, (unsigned) stored_len, 0); /* without header */
1722 G2.compressed_len = stored_len << 3; 1721 G2.compressed_len = stored_len << 3;
1723
1724 } else if (stored_len + 4 <= opt_lenb && buf != NULL) { 1722 } else if (stored_len + 4 <= opt_lenb && buf != NULL) {
1725 /* 4: two words for the lengths */ 1723 /* 4: two words for the lengths */
1726 /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. 1724 /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
@@ -1734,7 +1732,6 @@ static ulg flush_block(char *buf, ulg stored_len, int eof)
1734 G2.compressed_len += (stored_len + 4) << 3; 1732 G2.compressed_len += (stored_len + 4) << 3;
1735 1733
1736 copy_block(buf, (unsigned) stored_len, 1); /* with header */ 1734 copy_block(buf, (unsigned) stored_len, 1); /* with header */
1737
1738 } else if (static_lenb == opt_lenb) { 1735 } else if (static_lenb == opt_lenb) {
1739 send_bits((STATIC_TREES << 1) + eof, 3); 1736 send_bits((STATIC_TREES << 1) + eof, 3);
1740 compress_block((ct_data *) G2.static_ltree, (ct_data *) G2.static_dtree); 1737 compress_block((ct_data *) G2.static_ltree, (ct_data *) G2.static_dtree);
diff --git a/archival/libarchive/bz/compress.c b/archival/libarchive/bz/compress.c
index 23de9d3f5..2d994685c 100644
--- a/archival/libarchive/bz/compress.c
+++ b/archival/libarchive/bz/compress.c
@@ -385,7 +385,6 @@ void sendMTFValues(EState* s)
385 cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16; 385 cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16;
386 cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16; 386 cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16;
387 cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16; 387 cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16;
388
389 } else 388 } else
390#endif 389#endif
391 { 390 {
diff --git a/archival/libarchive/decompress_uncompress.c b/archival/libarchive/decompress_uncompress.c
index 496d864a7..034ed502d 100644
--- a/archival/libarchive/decompress_uncompress.c
+++ b/archival/libarchive/decompress_uncompress.c
@@ -297,7 +297,6 @@ unpack_Z_stream(transformer_state_t *xstate)
297 /* Remember previous code. */ 297 /* Remember previous code. */
298 oldcode = incode; 298 oldcode = incode;
299 } 299 }
300
301 } while (rsize > 0); 300 } while (rsize > 0);
302 301
303 if (outpos > 0) { 302 if (outpos > 0) {
diff --git a/archival/libarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c
index 2b490ae83..09ee4ba5c 100644
--- a/archival/libarchive/lzo1x_9x.c
+++ b/archival/libarchive/lzo1x_9x.c
@@ -71,7 +71,6 @@ typedef struct {
71 uint8_t *out; 71 uint8_t *out;
72 72
73 unsigned r1_lit; 73 unsigned r1_lit;
74
75} lzo1x_999_t; 74} lzo1x_999_t;
76 75
77#define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1)) 76#define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1))
diff --git a/archival/libarchive/unxz/xz_dec_lzma2.c b/archival/libarchive/unxz/xz_dec_lzma2.c
index 3c2dc88b7..351251f7c 100644
--- a/archival/libarchive/unxz/xz_dec_lzma2.c
+++ b/archival/libarchive/unxz/xz_dec_lzma2.c
@@ -995,10 +995,8 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run(
995 s->lzma2.need_props = false; 995 s->lzma2.need_props = false;
996 s->lzma2.next_sequence 996 s->lzma2.next_sequence
997 = SEQ_PROPERTIES; 997 = SEQ_PROPERTIES;
998
999 } else if (s->lzma2.need_props) { 998 } else if (s->lzma2.need_props) {
1000 return XZ_DATA_ERROR; 999 return XZ_DATA_ERROR;
1001
1002 } else { 1000 } else {
1003 s->lzma2.next_sequence 1001 s->lzma2.next_sequence
1004 = SEQ_LZMA_PREPARE; 1002 = SEQ_LZMA_PREPARE;
@@ -1080,7 +1078,6 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run(
1080 1078
1081 rc_reset(&s->rc); 1079 rc_reset(&s->rc);
1082 s->lzma2.sequence = SEQ_CONTROL; 1080 s->lzma2.sequence = SEQ_CONTROL;
1083
1084 } else if (b->out_pos == b->out_size 1081 } else if (b->out_pos == b->out_size
1085 || (b->in_pos == b->in_size 1082 || (b->in_pos == b->in_size
1086 && s->temp.size 1083 && s->temp.size
diff --git a/archival/libarchive/unxz/xz_dec_stream.c b/archival/libarchive/unxz/xz_dec_stream.c
index bdcbf1ba3..bf791055b 100644
--- a/archival/libarchive/unxz/xz_dec_stream.c
+++ b/archival/libarchive/unxz/xz_dec_stream.c
@@ -353,7 +353,6 @@ static enum xz_ret XZ_FUNC crc32_validate(struct xz_dec *s, struct xz_buf *b)
353 return XZ_DATA_ERROR; 353 return XZ_DATA_ERROR;
354 354
355 s->pos += 8; 355 s->pos += 8;
356
357 } while (s->pos < 32); 356 } while (s->pos < 32);
358 357
359 s->crc32 = 0; 358 s->crc32 = 0;
@@ -753,7 +752,6 @@ XZ_EXTERN enum xz_ret XZ_FUNC xz_dec_run(struct xz_dec *s, struct xz_buf *b)
753 b->in_pos = in_start; 752 b->in_pos = in_start;
754 b->out_pos = out_start; 753 b->out_pos = out_start;
755 } 754 }
756
757 } else if (ret == XZ_OK && in_start == b->in_pos 755 } else if (ret == XZ_OK && in_start == b->in_pos
758 && out_start == b->out_pos) { 756 && out_start == b->out_pos) {
759 if (s->allow_buf_error) 757 if (s->allow_buf_error)
diff --git a/archival/unzip.c b/archival/unzip.c
index eed225677..f41ab6f44 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -604,7 +604,6 @@ int unzip_main(int argc, char **argv)
604 || (zaccept && !find_list_entry(zaccept, dst_fn)) 604 || (zaccept && !find_list_entry(zaccept, dst_fn))
605 ) { /* Skip entry */ 605 ) { /* Skip entry */
606 i = 'n'; 606 i = 'n';
607
608 } else { 607 } else {
609 if (listing) { 608 if (listing) {
610 /* List entry */ 609 /* List entry */
@@ -666,7 +665,6 @@ int unzip_main(int argc, char **argv)
666 } 665 }
667 } 666 }
668 i = 'n'; 667 i = 'n';
669
670 } else { 668 } else {
671 /* Extract file */ 669 /* Extract file */
672 check_file: 670 check_file:
diff --git a/console-tools/showkey.c b/console-tools/showkey.c
index 69b785ec6..b7b4c32a8 100644
--- a/console-tools/showkey.c
+++ b/console-tools/showkey.c
@@ -83,7 +83,6 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
83 if (04 /*CTRL-D*/ == c) 83 if (04 /*CTRL-D*/ == c)
84 break; 84 break;
85 } 85 }
86
87 } else { 86 } else {
88 // we assume a PC keyboard 87 // we assume a PC keyboard
89 xioctl(STDIN_FILENO, KDGKBMODE, &kbmode); 88 xioctl(STDIN_FILENO, KDGKBMODE, &kbmode);
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 3b822e8c7..168814801 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -134,7 +134,6 @@ int ln_main(int argc, char **argv)
134 } 134 }
135 135
136 free(src_name); 136 free(src_name);
137
138 } while ((++argv)[1]); 137 } while ((++argv)[1]);
139 138
140 return status; 139 return status;
diff --git a/editors/awk.c b/editors/awk.c
index f487163af..9c6819ad2 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -1060,12 +1060,10 @@ static uint32_t next_token(uint32_t expected)
1060 1060
1061 if (t_rollback) { 1061 if (t_rollback) {
1062 t_rollback = FALSE; 1062 t_rollback = FALSE;
1063
1064 } else if (concat_inserted) { 1063 } else if (concat_inserted) {
1065 concat_inserted = FALSE; 1064 concat_inserted = FALSE;
1066 t_tclass = save_tclass; 1065 t_tclass = save_tclass;
1067 t_info = save_info; 1066 t_info = save_info;
1068
1069 } else { 1067 } else {
1070 p = g_pos; 1068 p = g_pos;
1071 readnext: 1069 readnext:
@@ -1081,7 +1079,6 @@ static uint32_t next_token(uint32_t expected)
1081 if (*p == '\0') { 1079 if (*p == '\0') {
1082 tc = TC_EOF; 1080 tc = TC_EOF;
1083 debug_printf_parse("%s: token found: TC_EOF\n", __func__); 1081 debug_printf_parse("%s: token found: TC_EOF\n", __func__);
1084
1085 } else if (*p == '\"') { 1082 } else if (*p == '\"') {
1086 /* it's a string */ 1083 /* it's a string */
1087 t_string = s = ++p; 1084 t_string = s = ++p;
@@ -1097,7 +1094,6 @@ static uint32_t next_token(uint32_t expected)
1097 *s = '\0'; 1094 *s = '\0';
1098 tc = TC_STRING; 1095 tc = TC_STRING;
1099 debug_printf_parse("%s: token found:'%s' TC_STRING\n", __func__, t_string); 1096 debug_printf_parse("%s: token found:'%s' TC_STRING\n", __func__, t_string);
1100
1101 } else if ((expected & TC_REGEXP) && *p == '/') { 1097 } else if ((expected & TC_REGEXP) && *p == '/') {
1102 /* it's regexp */ 1098 /* it's regexp */
1103 t_string = s = ++p; 1099 t_string = s = ++p;
@@ -1130,7 +1126,6 @@ static uint32_t next_token(uint32_t expected)
1130 syntax_error(EMSG_UNEXP_TOKEN); 1126 syntax_error(EMSG_UNEXP_TOKEN);
1131 tc = TC_NUMBER; 1127 tc = TC_NUMBER;
1132 debug_printf_parse("%s: token found:%f TC_NUMBER\n", __func__, t_double); 1128 debug_printf_parse("%s: token found:%f TC_NUMBER\n", __func__, t_double);
1133
1134 } else { 1129 } else {
1135 /* search for something known */ 1130 /* search for something known */
1136 tl = tokenlist; 1131 tl = tokenlist;
@@ -1580,12 +1575,10 @@ static void parse_program(char *p)
1580 debug_printf_parse("%s: TC_BEGIN\n", __func__); 1575 debug_printf_parse("%s: TC_BEGIN\n", __func__);
1581 seq = &beginseq; 1576 seq = &beginseq;
1582 chain_group(); 1577 chain_group();
1583
1584 } else if (tclass & TC_END) { 1578 } else if (tclass & TC_END) {
1585 debug_printf_parse("%s: TC_END\n", __func__); 1579 debug_printf_parse("%s: TC_END\n", __func__);
1586 seq = &endseq; 1580 seq = &endseq;
1587 chain_group(); 1581 chain_group();
1588
1589 } else if (tclass & TC_FUNCDECL) { 1582 } else if (tclass & TC_FUNCDECL) {
1590 debug_printf_parse("%s: TC_FUNCDECL\n", __func__); 1583 debug_printf_parse("%s: TC_FUNCDECL\n", __func__);
1591 next_token(TC_FUNCTION); 1584 next_token(TC_FUNCTION);
@@ -1603,7 +1596,6 @@ static void parse_program(char *p)
1603 seq = &f->body; 1596 seq = &f->body;
1604 chain_group(); 1597 chain_group();
1605 clear_array(ahash); 1598 clear_array(ahash);
1606
1607 } else if (tclass & TC_OPSEQ) { 1599 } else if (tclass & TC_OPSEQ) {
1608 debug_printf_parse("%s: TC_OPSEQ\n", __func__); 1600 debug_printf_parse("%s: TC_OPSEQ\n", __func__);
1609 rollback_token(); 1601 rollback_token();
@@ -1618,7 +1610,6 @@ static void parse_program(char *p)
1618 chain_node(OC_PRINT); 1610 chain_node(OC_PRINT);
1619 } 1611 }
1620 cn->r.n = mainseq.last; 1612 cn->r.n = mainseq.last;
1621
1622 } else /* if (tclass & TC_GRPSTART) */ { 1613 } else /* if (tclass & TC_GRPSTART) */ {
1623 debug_printf_parse("%s: TC_GRPSTART(?)\n", __func__); 1614 debug_printf_parse("%s: TC_GRPSTART(?)\n", __func__);
1624 rollback_token(); 1615 rollback_token();
@@ -1879,13 +1870,10 @@ static void handle_special(var *v)
1879 split_f0(); 1870 split_f0();
1880 1871
1881 mk_splitter(getvar_s(v), &fsplitter); 1872 mk_splitter(getvar_s(v), &fsplitter);
1882
1883 } else if (v == intvar[RS]) { 1873 } else if (v == intvar[RS]) {
1884 mk_splitter(getvar_s(v), &rsplitter); 1874 mk_splitter(getvar_s(v), &rsplitter);
1885
1886 } else if (v == intvar[IGNORECASE]) { 1875 } else if (v == intvar[IGNORECASE]) {
1887 icase = istrue(v); 1876 icase = istrue(v);
1888
1889 } else { /* $n */ 1877 } else { /* $n */
1890 n = getvar_i(intvar[NF]); 1878 n = getvar_i(intvar[NF]);
1891 setvar_i(intvar[NF], n > v-Fields ? n : v-Fields+1); 1879 setvar_i(intvar[NF], n > v-Fields ? n : v-Fields+1);
diff --git a/editors/ed.c b/editors/ed.c
index 3087fb0b9..f0e5e4d5d 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -732,7 +732,6 @@ static int readLines(const char *file, int num)
732 cc = safe_read(fd, bufPtr, bufSize - bufUsed); 732 cc = safe_read(fd, bufPtr, bufSize - bufUsed);
733 bufUsed += cc; 733 bufUsed += cc;
734 bufPtr = bufBase; 734 bufPtr = bufBase;
735
736 } while (cc > 0); 735 } while (cc > 0);
737 736
738 if (cc < 0) { 737 if (cc < 0) {
diff --git a/editors/vi.c b/editors/vi.c
index 6ce513c0c..3db597ae1 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -411,7 +411,6 @@ struct globals {
411 char undo_text[1]; // text that was deleted (if deletion) 411 char undo_text[1]; // text that was deleted (if deletion)
412 } *undo_stack_tail; 412 } *undo_stack_tail;
413#endif /* ENABLE_FEATURE_VI_UNDO */ 413#endif /* ENABLE_FEATURE_VI_UNDO */
414
415}; 414};
416#define G (*ptr_to_globals) 415#define G (*ptr_to_globals)
417#define text (G.text ) 416#define text (G.text )
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 46849e4f0..24253cf27 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -457,7 +457,6 @@ static void parse_config_file(void)
457 errmsg = "keyword outside section"; 457 errmsg = "keyword outside section";
458 goto pe_label; 458 goto pe_label;
459 } 459 }
460
461 } /* while (1) */ 460 } /* while (1) */
462 461
463 pe_label: 462 pe_label:
diff --git a/libbb/in_ether.c b/libbb/in_ether.c
index 1de383bde..161c8ea3c 100644
--- a/libbb/in_ether.c
+++ b/libbb/in_ether.c
@@ -51,7 +51,6 @@ int FAST_FUNC in_ether(const char *bufp, struct sockaddr *sap)
51 } while (j); 51 } while (j);
52 52
53 *ptr++ = val; 53 *ptr++ = val;
54
55 } while (--i); 54 } while (--i);
56 55
57 /* Error if we aren't at end of string */ 56 /* Error if we aren't at end of string */
diff --git a/libbb/procps.c b/libbb/procps.c
index 948b91ee6..3d335b37b 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -614,7 +614,6 @@ void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
614 buf[comm_len - 1] = ' '; 614 buf[comm_len - 1] = ' ';
615 buf[col - 1] = '\0'; 615 buf[col - 1] = '\0';
616 } 616 }
617
618 } else { 617 } else {
619 snprintf(buf, col, "[%s]", comm); 618 snprintf(buf, col, "[%s]", comm);
620 } 619 }
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index f25ce9446..0c9969640 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -207,7 +207,6 @@ off_t FAST_FUNC fdlength(int fd)
207 else bottom = pos; 207 else bottom = pos;
208 208
209 // If we can't, it's smaller. 209 // If we can't, it's smaller.
210
211 } else { 210 } else {
212 if (bottom == top) { 211 if (bottom == top) {
213 if (!top) return 0; 212 if (!top) return 0;
diff --git a/mailutils/reformime.c b/mailutils/reformime.c
index 8e7d455f6..86b2cfed3 100644
--- a/mailutils/reformime.c
+++ b/mailutils/reformime.c
@@ -134,7 +134,6 @@ static int parse(const char *boundary, char **argv)
134 if (strcasecmp(type + 10, "mixed") != 0) 134 if (strcasecmp(type + 10, "mixed") != 0)
135 bb_error_msg_and_die("no support of content type '%s'", type); 135 bb_error_msg_and_die("no support of content type '%s'", type);
136 parse(xfind_token(tokens, "boundary"), argv); 136 parse(xfind_token(tokens, "boundary"), argv);
137
138 } else { 137 } else {
139 /* No, process one non-multipart section */ 138 /* No, process one non-multipart section */
140 char *end; 139 char *end;
diff --git a/miscutils/crontab.c b/miscutils/crontab.c
index aad242fd8..85c6623b2 100644
--- a/miscutils/crontab.c
+++ b/miscutils/crontab.c
@@ -170,7 +170,6 @@ int crontab_main(int argc UNUSED_PARAM, char **argv)
170 unlink(tmp_fname); 170 unlink(tmp_fname);
171 /*free(tmp_fname);*/ 171 /*free(tmp_fname);*/
172 /*free(new_fname);*/ 172 /*free(new_fname);*/
173
174 } /* switch */ 173 } /* switch */
175 174
176 /* Bump notification file. Handle window where crond picks file up 175 /* Bump notification file. Handle window where crond picks file up
diff --git a/networking/arp.c b/networking/arp.c
index e79b1b6a1..0099aa534 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -68,7 +68,6 @@ struct globals {
68 const struct hwtype *hw; /* current hardware type */ 68 const struct hwtype *hw; /* current hardware type */
69 const char *device; /* current device */ 69 const char *device; /* current device */
70 smallint hw_set; /* flag if hw-type was set (-H) */ 70 smallint hw_set; /* flag if hw-type was set (-H) */
71
72} FIX_ALIASING; 71} FIX_ALIASING;
73#define G (*(struct globals*)&bb_common_bufsiz1) 72#define G (*(struct globals*)&bb_common_bufsiz1)
74#define ap (G.ap ) 73#define ap (G.ap )
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 0233ed82c..b5120a70d 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1497,7 +1497,6 @@ update_local_clock(peer_t *p)
1497#endif 1497#endif
1498 abs_offset = offset = 0; 1498 abs_offset = offset = 0;
1499 set_new_values(STATE_SYNC, offset, recv_time); 1499 set_new_values(STATE_SYNC, offset, recv_time);
1500
1501 } else { /* abs_offset <= STEP_THRESHOLD */ 1500 } else { /* abs_offset <= STEP_THRESHOLD */
1502 1501
1503 /* The ratio is calculated before jitter is updated to make 1502 /* The ratio is calculated before jitter is updated to make
diff --git a/networking/tftp.c b/networking/tftp.c
index 7c0ee58d7..8ecd7bb6f 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -348,7 +348,6 @@ static int tftp_protocol(
348 * as if it is "block 0" */ 348 * as if it is "block 0" */
349 block_nr = 0; 349 block_nr = 0;
350 } 350 }
351
352 } else { /* tftp */ 351 } else { /* tftp */
353 /* Open file (must be after changing user) */ 352 /* Open file (must be after changing user) */
354 local_fd = CMD_GET(option_mask32) ? STDOUT_FILENO : STDIN_FILENO; 353 local_fd = CMD_GET(option_mask32) ? STDOUT_FILENO : STDIN_FILENO;
diff --git a/networking/wget.c b/networking/wget.c
index 6c8bd90a8..f744ea2de 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1050,7 +1050,6 @@ However, in real world it was observed that some web servers
1050 1050
1051 /* For HTTP, data is pumped over the same connection */ 1051 /* For HTTP, data is pumped over the same connection */
1052 dfp = sfp; 1052 dfp = sfp;
1053
1054 } else { 1053 } else {
1055 /* 1054 /*
1056 * FTP session 1055 * FTP session
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 0173db99e..c974c4a9d 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -251,7 +251,6 @@ static int match(const char *name, struct stat *sb, char **con)
251 name = path; 251 name = path;
252 if (excludeCtr > 0 && exclude(name)) 252 if (excludeCtr > 0 && exclude(name))
253 goto err; 253 goto err;
254
255 } else { 254 } else {
256 char *p; 255 char *p;
257 p = realpath(name, path); 256 p = realpath(name, path);
diff --git a/shell/ash.c b/shell/ash.c
index 282f761fc..4c01e67d4 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9447,7 +9447,6 @@ evalcommand(union node *cmd, int flags)
9447 if (evalfun(cmdentry.u.func, argc, argv, flags)) 9447 if (evalfun(cmdentry.u.func, argc, argv, flags))
9448 goto raise; 9448 goto raise;
9449 break; 9449 break;
9450
9451 } /* switch */ 9450 } /* switch */
9452 9451
9453 out: 9452 out:
@@ -11763,7 +11762,6 @@ parsearith: {
11763 goto parsearith_return; 11762 goto parsearith_return;
11764} 11763}
11765#endif 11764#endif
11766
11767} /* end of readtoken */ 11765} /* end of readtoken */
11768 11766
11769/* 11767/*
diff --git a/shell/hush.c b/shell/hush.c
index 96c739fb7..3ca04494c 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -5390,7 +5390,6 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg)
5390 !!(output->o_expflags & EXP_FLAG_ESC_GLOB_CHARS)); 5390 !!(output->o_expflags & EXP_FLAG_ESC_GLOB_CHARS));
5391 } 5391 }
5392 break; 5392 break;
5393
5394 } /* switch (char after <SPECIAL_VAR_SYMBOL>) */ 5393 } /* switch (char after <SPECIAL_VAR_SYMBOL>) */
5395 5394
5396 if (val && val[0]) { 5395 if (val && val[0]) {
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 57297155e..2b6f7dc92 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -493,7 +493,6 @@ shell_builtin_ulimit(char **argv)
493 /* bad option. getopt already complained. */ 493 /* bad option. getopt already complained. */
494 break; 494 break;
495 } 495 }
496
497 } /* while (there are options) */ 496 } /* while (there are options) */
498 497
499 return 0; 498 return 0;
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 266657f3b..156f487e5 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -237,7 +237,6 @@ enum {
237 OPT_dup = IF_FEATURE_SYSLOGD_DUP( (1 << OPTBIT_dup )) + 0, 237 OPT_dup = IF_FEATURE_SYSLOGD_DUP( (1 << OPTBIT_dup )) + 0,
238 OPT_cfg = IF_FEATURE_SYSLOGD_CFG( (1 << OPTBIT_cfg )) + 0, 238 OPT_cfg = IF_FEATURE_SYSLOGD_CFG( (1 << OPTBIT_cfg )) + 0,
239 OPT_kmsg = IF_FEATURE_KMSG_SYSLOG( (1 << OPTBIT_kmsg )) + 0, 239 OPT_kmsg = IF_FEATURE_KMSG_SYSLOG( (1 << OPTBIT_kmsg )) + 0,
240
241}; 240};
242#define OPTION_STR "m:nO:l:S" \ 241#define OPTION_STR "m:nO:l:S" \
243 IF_FEATURE_ROTATE_LOGFILE("s:" ) \ 242 IF_FEATURE_ROTATE_LOGFILE("s:" ) \