Apple-2gs-SW
/
hush
mirror of https://github.com/sheumann/hush.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Maninder Singh 2015-06-10 03:47:27 +00:00 committed by Denys Vlasenko
parent b7ee7e1e13
commit 97f2f7ca7f
28 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archival/cpio.c
View File

@ -257,7 +257,6 @@ static NOINLINE int cpio_o(void)
free(line); free(line);
continue; continue;
} }
} else { /* line == NULL: EOF */ } else { /* line == NULL: EOF */
next_link: next_link:
if (links) { if (links) {

3
archival/gzip.c
View File

@ -1372,7 +1372,6 @@ static void build_tree(tree_desc * desc)
/* and insert the new node in the heap */ /* and insert the new node in the heap */
G2.heap[SMALLEST] = node++; G2.heap[SMALLEST] = node++;
pqdownheap(tree, SMALLEST); pqdownheap(tree, SMALLEST);
} while (G2.heap_len >= 2); } while (G2.heap_len >= 2);
G2.heap[--G2.heap_max] = G2.heap[SMALLEST]; G2.heap[--G2.heap_max] = G2.heap[SMALLEST];
@ -1720,7 +1719,6 @@ static ulg flush_block(char *buf, ulg stored_len, int eof)
copy_block(buf, (unsigned) stored_len, 0); /* without header */ copy_block(buf, (unsigned) stored_len, 0); /* without header */
G2.compressed_len = stored_len << 3; G2.compressed_len = stored_len << 3;
} else if (stored_len + 4 <= opt_lenb && buf != NULL) { } else if (stored_len + 4 <= opt_lenb && buf != NULL) {
/* 4: two words for the lengths */ /* 4: two words for the lengths */
/* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. /* 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)
G2.compressed_len += (stored_len + 4) << 3; G2.compressed_len += (stored_len + 4) << 3;
copy_block(buf, (unsigned) stored_len, 1); /* with header */ copy_block(buf, (unsigned) stored_len, 1); /* with header */
} else if (static_lenb == opt_lenb) { } else if (static_lenb == opt_lenb) {
send_bits((STATIC_TREES << 1) + eof, 3); send_bits((STATIC_TREES << 1) + eof, 3);
compress_block((ct_data *) G2.static_ltree, (ct_data *) G2.static_dtree); compress_block((ct_data *) G2.static_ltree, (ct_data *) G2.static_dtree);

1
archival/libarchive/bz/compress.c
View File

@ -385,7 +385,6 @@ void sendMTFValues(EState* s)
cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16; cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16;
cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16; cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16;
cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16; cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16;
} else } else
#endif #endif
{ {

1
archival/libarchive/decompress_uncompress.c
View File

@ -297,7 +297,6 @@ unpack_Z_stream(transformer_state_t *xstate)
/* Remember previous code. */ /* Remember previous code. */
oldcode = incode; oldcode = incode;
} }
} while (rsize > 0); } while (rsize > 0);
if (outpos > 0) { if (outpos > 0) {

1
archival/libarchive/lzo1x_9x.c
View File

@ -71,7 +71,6 @@ typedef struct {
uint8_t *out; uint8_t *out;
unsigned r1_lit; unsigned r1_lit;
} lzo1x_999_t; } lzo1x_999_t;
#define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1)) #define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1))

3
archival/libarchive/unxz/xz_dec_lzma2.c
View File

@ -995,10 +995,8 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run(
s->lzma2.need_props = false; s->lzma2.need_props = false;
s->lzma2.next_sequence s->lzma2.next_sequence
= SEQ_PROPERTIES; = SEQ_PROPERTIES;
} else if (s->lzma2.need_props) { } else if (s->lzma2.need_props) {
return XZ_DATA_ERROR; return XZ_DATA_ERROR;
} else { } else {
s->lzma2.next_sequence s->lzma2.next_sequence
= SEQ_LZMA_PREPARE; = SEQ_LZMA_PREPARE;
@ -1080,7 +1078,6 @@ XZ_EXTERN NOINLINE enum xz_ret XZ_FUNC xz_dec_lzma2_run(
rc_reset(&s->rc); rc_reset(&s->rc);
s->lzma2.sequence = SEQ_CONTROL; s->lzma2.sequence = SEQ_CONTROL;
} else if (b->out_pos == b->out_size } else if (b->out_pos == b->out_size
|| (b->in_pos == b->in_size || (b->in_pos == b->in_size
&& s->temp.size && s->temp.size

2
archival/libarchive/unxz/xz_dec_stream.c
View File

@ -353,7 +353,6 @@ static enum xz_ret XZ_FUNC crc32_validate(struct xz_dec *s, struct xz_buf *b)
return XZ_DATA_ERROR; return XZ_DATA_ERROR;
s->pos += 8; s->pos += 8;
} while (s->pos < 32); } while (s->pos < 32);
s->crc32 = 0; 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)
b->in_pos = in_start; b->in_pos = in_start;
b->out_pos = out_start; b->out_pos = out_start;
} }
} else if (ret == XZ_OK && in_start == b->in_pos } else if (ret == XZ_OK && in_start == b->in_pos
&& out_start == b->out_pos) { && out_start == b->out_pos) {
if (s->allow_buf_error) if (s->allow_buf_error)

2
archival/unzip.c
View File

@ -604,7 +604,6 @@ int unzip_main(int argc, char **argv)
|| (zaccept && !find_list_entry(zaccept, dst_fn)) || (zaccept && !find_list_entry(zaccept, dst_fn))
) { /* Skip entry */ ) { /* Skip entry */
i = 'n'; i = 'n';
} else { } else {
if (listing) { if (listing) {
/* List entry */ /* List entry */
@ -666,7 +665,6 @@ int unzip_main(int argc, char **argv)
} }
} }
i = 'n'; i = 'n';
} else { } else {
/* Extract file */ /* Extract file */
check_file: check_file:

1
console-tools/showkey.c
View File

@ -83,7 +83,6 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
if (04 /*CTRL-D*/ == c) if (04 /*CTRL-D*/ == c)
break; break;
} }
} else { } else {
// we assume a PC keyboard // we assume a PC keyboard
xioctl(STDIN_FILENO, KDGKBMODE, &kbmode); xioctl(STDIN_FILENO, KDGKBMODE, &kbmode);

1
coreutils/ln.c
View File

@ -134,7 +134,6 @@ int ln_main(int argc, char **argv)
} }
free(src_name); free(src_name);
} while ((++argv)[1]); } while ((++argv)[1]);
return status; return status;

12
editors/awk.c
View File

@ -1060,12 +1060,10 @@ static uint32_t next_token(uint32_t expected)
if (t_rollback) { if (t_rollback) {
t_rollback = FALSE; t_rollback = FALSE;
} else if (concat_inserted) { } else if (concat_inserted) {
concat_inserted = FALSE; concat_inserted = FALSE;
t_tclass = save_tclass; t_tclass = save_tclass;
t_info = save_info; t_info = save_info;
} else { } else {
p = g_pos; p = g_pos;
readnext: readnext:
@ -1081,7 +1079,6 @@ static uint32_t next_token(uint32_t expected)
if (*p == '\0') { if (*p == '\0') {
tc = TC_EOF; tc = TC_EOF;
debug_printf_parse("%s: token found: TC_EOF\n", __func__); debug_printf_parse("%s: token found: TC_EOF\n", __func__);
} else if (*p == '\"') { } else if (*p == '\"') {
/* it's a string */ /* it's a string */
t_string = s = ++p; t_string = s = ++p;
@ -1097,7 +1094,6 @@ static uint32_t next_token(uint32_t expected)
*s = '\0'; *s = '\0';
tc = TC_STRING; tc = TC_STRING;
debug_printf_parse("%s: token found:'%s' TC_STRING\n", __func__, t_string); debug_printf_parse("%s: token found:'%s' TC_STRING\n", __func__, t_string);
} else if ((expected & TC_REGEXP) && *p == '/') { } else if ((expected & TC_REGEXP) && *p == '/') {
/* it's regexp */ /* it's regexp */
t_string = s = ++p; t_string = s = ++p;
@ -1130,7 +1126,6 @@ static uint32_t next_token(uint32_t expected)
syntax_error(EMSG_UNEXP_TOKEN); syntax_error(EMSG_UNEXP_TOKEN);
tc = TC_NUMBER; tc = TC_NUMBER;
debug_printf_parse("%s: token found:%f TC_NUMBER\n", __func__, t_double); debug_printf_parse("%s: token found:%f TC_NUMBER\n", __func__, t_double);
} else { } else {
/* search for something known */ /* search for something known */
tl = tokenlist; tl = tokenlist;
@ -1580,12 +1575,10 @@ static void parse_program(char *p)
debug_printf_parse("%s: TC_BEGIN\n", __func__); debug_printf_parse("%s: TC_BEGIN\n", __func__);
seq = &beginseq; seq = &beginseq;
chain_group(); chain_group();
} else if (tclass & TC_END) { } else if (tclass & TC_END) {
debug_printf_parse("%s: TC_END\n", __func__); debug_printf_parse("%s: TC_END\n", __func__);
seq = &endseq; seq = &endseq;
chain_group(); chain_group();
} else if (tclass & TC_FUNCDECL) { } else if (tclass & TC_FUNCDECL) {
debug_printf_parse("%s: TC_FUNCDECL\n", __func__); debug_printf_parse("%s: TC_FUNCDECL\n", __func__);
next_token(TC_FUNCTION); next_token(TC_FUNCTION);
@ -1603,7 +1596,6 @@ static void parse_program(char *p)
seq = &f->body; seq = &f->body;
chain_group(); chain_group();
clear_array(ahash); clear_array(ahash);
} else if (tclass & TC_OPSEQ) { } else if (tclass & TC_OPSEQ) {
debug_printf_parse("%s: TC_OPSEQ\n", __func__); debug_printf_parse("%s: TC_OPSEQ\n", __func__);
rollback_token(); rollback_token();
@ -1618,7 +1610,6 @@ static void parse_program(char *p)
chain_node(OC_PRINT); chain_node(OC_PRINT);
} }
cn->r.n = mainseq.last; cn->r.n = mainseq.last;
} else /* if (tclass & TC_GRPSTART) */ { } else /* if (tclass & TC_GRPSTART) */ {
debug_printf_parse("%s: TC_GRPSTART(?)\n", __func__); debug_printf_parse("%s: TC_GRPSTART(?)\n", __func__);
rollback_token(); rollback_token();
@ -1879,13 +1870,10 @@ static void handle_special(var *v)
split_f0(); split_f0();
mk_splitter(getvar_s(v), &fsplitter); mk_splitter(getvar_s(v), &fsplitter);
} else if (v == intvar[RS]) { } else if (v == intvar[RS]) {
mk_splitter(getvar_s(v), &rsplitter); mk_splitter(getvar_s(v), &rsplitter);
} else if (v == intvar[IGNORECASE]) { } else if (v == intvar[IGNORECASE]) {
icase = istrue(v); icase = istrue(v);
} else { /* $n */ } else { /* $n */
n = getvar_i(intvar[NF]); n = getvar_i(intvar[NF]);
setvar_i(intvar[NF], n > v-Fields ? n : v-Fields+1); setvar_i(intvar[NF], n > v-Fields ? n : v-Fields+1);

1
editors/ed.c
View File

@ -732,7 +732,6 @@ static int readLines(const char *file, int num)
cc = safe_read(fd, bufPtr, bufSize - bufUsed); cc = safe_read(fd, bufPtr, bufSize - bufUsed);
bufUsed += cc; bufUsed += cc;
bufPtr = bufBase; bufPtr = bufBase;
} while (cc > 0); } while (cc > 0);
if (cc < 0) { if (cc < 0) {

1
editors/vi.c
View File

@ -411,7 +411,6 @@ struct globals {
char undo_text[1]; // text that was deleted (if deletion) char undo_text[1]; // text that was deleted (if deletion)
} *undo_stack_tail; } *undo_stack_tail;
#endif /* ENABLE_FEATURE_VI_UNDO */ #endif /* ENABLE_FEATURE_VI_UNDO */
}; };
#define G (*ptr_to_globals) #define G (*ptr_to_globals)
#define text (G.text ) #define text (G.text )

1
libbb/appletlib.c
View File

@ -457,7 +457,6 @@ static void parse_config_file(void)
errmsg = "keyword outside section"; errmsg = "keyword outside section";
goto pe_label; goto pe_label;
} }
} /* while (1) */ } /* while (1) */
pe_label: pe_label:

1
libbb/in_ether.c
View File

@ -51,7 +51,6 @@ int FAST_FUNC in_ether(const char *bufp, struct sockaddr *sap)
} while (j); } while (j);
*ptr++ = val; *ptr++ = val;
} while (--i); } while (--i);
/* Error if we aren't at end of string */ /* Error if we aren't at end of string */

1
libbb/procps.c
View File

@ -614,7 +614,6 @@ void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
buf[comm_len - 1] = ' '; buf[comm_len - 1] = ' ';
buf[col - 1] = '\0'; buf[col - 1] = '\0';
} }
} else { } else {
snprintf(buf, col, "[%s]", comm); snprintf(buf, col, "[%s]", comm);
} }

1
libbb/xfuncs.c
View File

@ -207,7 +207,6 @@ off_t FAST_FUNC fdlength(int fd)
else bottom = pos; else bottom = pos;
// If we can't, it's smaller. // If we can't, it's smaller.
} else { } else {
if (bottom == top) { if (bottom == top) {
if (!top) return 0; if (!top) return 0;

1
mailutils/reformime.c
View File

@ -134,7 +134,6 @@ static int parse(const char *boundary, char **argv)
if (strcasecmp(type + 10, "mixed") != 0) if (strcasecmp(type + 10, "mixed") != 0)
bb_error_msg_and_die("no support of content type '%s'", type); bb_error_msg_and_die("no support of content type '%s'", type);
parse(xfind_token(tokens, "boundary"), argv); parse(xfind_token(tokens, "boundary"), argv);
} else { } else {
/* No, process one non-multipart section */ /* No, process one non-multipart section */
char *end; char *end;

1
miscutils/crontab.c
View File

@ -170,7 +170,6 @@ int crontab_main(int argc UNUSED_PARAM, char **argv)
unlink(tmp_fname); unlink(tmp_fname);
/*free(tmp_fname);*/ /*free(tmp_fname);*/
/*free(new_fname);*/ /*free(new_fname);*/
} /* switch */ } /* switch */
/* Bump notification file. Handle window where crond picks file up /* Bump notification file. Handle window where crond picks file up

1
networking/arp.c
View File

@ -68,7 +68,6 @@ struct globals {
const struct hwtype *hw; /* current hardware type */ const struct hwtype *hw; /* current hardware type */
const char *device; /* current device */ const char *device; /* current device */
smallint hw_set; /* flag if hw-type was set (-H) */ smallint hw_set; /* flag if hw-type was set (-H) */
} FIX_ALIASING; } FIX_ALIASING;
#define G (*(struct globals*)&bb_common_bufsiz1) #define G (*(struct globals*)&bb_common_bufsiz1)
#define ap (G.ap ) #define ap (G.ap )

1
networking/ntpd.c
View File

@ -1497,7 +1497,6 @@ update_local_clock(peer_t *p)
#endif #endif
abs_offset = offset = 0; abs_offset = offset = 0;
set_new_values(STATE_SYNC, offset, recv_time); set_new_values(STATE_SYNC, offset, recv_time);
} else { /* abs_offset <= STEP_THRESHOLD */ } else { /* abs_offset <= STEP_THRESHOLD */
/* The ratio is calculated before jitter is updated to make /* The ratio is calculated before jitter is updated to make

1
networking/tftp.c
View File

@ -348,7 +348,6 @@ static int tftp_protocol(
* as if it is "block 0" */ * as if it is "block 0" */
block_nr = 0; block_nr = 0;
} }
} else { /* tftp */ } else { /* tftp */
/* Open file (must be after changing user) */ /* Open file (must be after changing user) */
local_fd = CMD_GET(option_mask32) ? STDOUT_FILENO : STDIN_FILENO; local_fd = CMD_GET(option_mask32) ? STDOUT_FILENO : STDIN_FILENO;

1
networking/wget.c
View File

@ -1050,7 +1050,6 @@ However, in real world it was observed that some web servers
/* For HTTP, data is pumped over the same connection */ /* For HTTP, data is pumped over the same connection */
dfp = sfp; dfp = sfp;
} else { } else {
/* /*
* FTP session * FTP session

1
selinux/setfiles.c
View File

@ -251,7 +251,6 @@ static int match(const char *name, struct stat *sb, char **con)
name = path; name = path;
if (excludeCtr > 0 && exclude(name)) if (excludeCtr > 0 && exclude(name))
goto err; goto err;
} else { } else {
char *p; char *p;
p = realpath(name, path); p = realpath(name, path);

2
shell/ash.c
View File

@ -9447,7 +9447,6 @@ evalcommand(union node *cmd, int flags)
if (evalfun(cmdentry.u.func, argc, argv, flags)) if (evalfun(cmdentry.u.func, argc, argv, flags))
goto raise; goto raise;
break; break;
} /* switch */ } /* switch */
out: out:
@ -11763,7 +11762,6 @@ parsearith: {
goto parsearith_return; goto parsearith_return;
} }
#endif #endif
} /* end of readtoken */ } /* end of readtoken */
/* /*

1
shell/hush.c
View File

@ -5390,7 +5390,6 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg)
!!(output->o_expflags & EXP_FLAG_ESC_GLOB_CHARS)); !!(output->o_expflags & EXP_FLAG_ESC_GLOB_CHARS));
} }
break; break;
} /* switch (char after <SPECIAL_VAR_SYMBOL>) */ } /* switch (char after <SPECIAL_VAR_SYMBOL>) */
if (val && val[0]) { if (val && val[0]) {

1
shell/shell_common.c
View File

@ -493,7 +493,6 @@ shell_builtin_ulimit(char **argv)
/* bad option. getopt already complained. */ /* bad option. getopt already complained. */
break; break;
} }
} /* while (there are options) */ } /* while (there are options) */
return 0; return 0;

1
sysklogd/syslogd.c
View File

@ -237,7 +237,6 @@ enum {
OPT_dup = IF_FEATURE_SYSLOGD_DUP( (1 << OPTBIT_dup )) + 0, OPT_dup = IF_FEATURE_SYSLOGD_DUP( (1 << OPTBIT_dup )) + 0,
OPT_cfg = IF_FEATURE_SYSLOGD_CFG( (1 << OPTBIT_cfg )) + 0, OPT_cfg = IF_FEATURE_SYSLOGD_CFG( (1 << OPTBIT_cfg )) + 0,
OPT_kmsg = IF_FEATURE_KMSG_SYSLOG( (1 << OPTBIT_kmsg )) + 0, OPT_kmsg = IF_FEATURE_KMSG_SYSLOG( (1 << OPTBIT_kmsg )) + 0,
}; };
#define OPTION_STR "m:nO:l:S" \ #define OPTION_STR "m:nO:l:S" \
IF_FEATURE_ROTATE_LOGFILE("s:" ) \ IF_FEATURE_ROTATE_LOGFILE("s:" ) \