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

*: style fixes. no code changes (verified with objdump)

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-01-28 02:24:24 +01:00
parent 17323a6245
commit 6b9f163353
23 changed files with 231 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archival/bz/bzlib.c
View File

@ -393,10 +393,12 @@ int BZ2_bzBuffToBuffCompress(char* dest,
bz_stream strm;
int ret;
if (dest == NULL || destLen == NULL ||
source == NULL ||
blockSize100k < 1 || blockSize100k > 9)
if (dest == NULL || destLen == NULL
|| source == NULL
|| blockSize100k < 1 || blockSize100k > 9
) {
return BZ_PARAM_ERROR;
}
BZ2_bzCompressInit(&strm, blockSize100k);

10
archival/dpkg.c
View File

@ -858,8 +858,9 @@ static void write_status_file(deb_file_t **deb_file)
if (field_name == NULL) {
break;
}
if ((strcmp(field_name, "Priority") == 0) ||
(strcmp(field_name, "Section") == 0)) {
if ((strcmp(field_name, "Priority") == 0)
|| (strcmp(field_name, "Section") == 0)
) {
fprintf(new_status_file, "%s: %s\n", field_name, field_value);
}
}
@ -1079,8 +1080,9 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
package_num = search_package_hashtable(package_edge->name, package_edge->version, package_edge->operator);
if (package_edge->type == EDGE_PRE_DEPENDS ||
package_edge->type == EDGE_DEPENDS) {
if (package_edge->type == EDGE_PRE_DEPENDS
|| package_edge->type == EDGE_DEPENDS
) {
int result=1;
status_num = 0;

8
archival/gzip.c
View File

@ -620,10 +620,12 @@ static int longest_match(IPos cur_match)
/* Skip to next match if the match length cannot increase
* or if the match length is less than 2:
*/
if (match[best_len] != scan_end ||
match[best_len - 1] != scan_end1 ||
*match != *scan || *++match != scan[1])
if (match[best_len] != scan_end
|| match[best_len - 1] != scan_end1
|| *match != *scan || *++match != scan[1]
) {
continue;
}
/* The check at best_len-1 can be removed because it will be made
* again later. (This heuristic is not always a win.)

60
archival/lzo1x_9x.c
View File

@ -298,10 +298,11 @@ static void swd_search(lzo_swd_p s, unsigned node, unsigned cnt)
assert(m_len < s->look);
if (p2[m_len - 1] == scan_end1 &&
p2[m_len] == p1[m_len] &&
p2[0] == p1[0] &&
p2[1] == p1[1]) {
if (p2[m_len - 1] == scan_end1
&& p2[m_len] == p1[m_len]
&& p2[0] == p1[0]
&& p2[1] == p1[1]
) {
unsigned i;
assert(lzo_memcmp(bp, &b[node], 3) == 0);
@ -404,12 +405,13 @@ static void swd_findbest(lzo_swd_p s)
#if defined(SWD_BEST_OFF)
if (s->use_best_off) {
int i;
for (i = 2; i < SWD_BEST_OFF; i++)
for (i = 2; i < SWD_BEST_OFF; i++) {
if (s->best_pos[i] > 0)
s->best_off[i] = swd_pos2off(s, s->best_pos[i]-1);
else
s->best_off[i] = 0;
}
}
#endif
}
@ -505,7 +507,8 @@ static uint8_t *code_match(lzo1x_999_t *c,
assert(op > c->out);
if (m_len == 2) {
assert(m_off <= M1_MAX_OFFSET);
assert(c->r1_lit > 0); assert(c->r1_lit < 4);
assert(c->r1_lit > 0);
assert(c->r1_lit < 4);
m_off -= 1;
*op++ = M1_MARKER | ((m_off & 3) << 2);
*op++ = m_off >> 2;
@ -529,8 +532,7 @@ static uint8_t *code_match(lzo1x_999_t *c,
else {
m_len -= M3_MAX_LEN;
*op++ = M3_MARKER | 0;
while (m_len > 255)
{
while (m_len > 255) {
m_len -= 255;
*op++ = 0;
}
@ -543,7 +545,8 @@ static uint8_t *code_match(lzo1x_999_t *c,
unsigned k;
assert(m_len >= 3);
assert(m_off > 0x4000); assert(m_off <= 0xbfff);
assert(m_off > 0x4000);
assert(m_off <= 0xbfff);
m_off -= 0x4000;
k = (m_off & 0x4000) >> 11;
if (m_len <= M4_MAX_LEN)
@ -551,8 +554,7 @@ static uint8_t *code_match(lzo1x_999_t *c,
else {
m_len -= M4_MAX_LEN;
*op++ = M4_MARKER | k | 0;
while (m_len > 255)
{
while (m_len > 255) {
m_len -= 255;
*op++ = 0;
}
@ -681,29 +683,29 @@ static void better_match(const lzo_swd_p swd,
return;
/* M3/M4 -> M2 */
if (*m_off > M2_MAX_OFFSET &&
*m_len >= M2_MIN_LEN + 1 && *m_len <= M2_MAX_LEN + 1 &&
swd->best_off[*m_len-1] && swd->best_off[*m_len-1] <= M2_MAX_OFFSET)
{
if (*m_off > M2_MAX_OFFSET
&& *m_len >= M2_MIN_LEN + 1 && *m_len <= M2_MAX_LEN + 1
&& swd->best_off[*m_len-1] && swd->best_off[*m_len-1] <= M2_MAX_OFFSET
) {
*m_len = *m_len - 1;
*m_off = swd->best_off[*m_len];
return;
}
/* M4 -> M2 */
if (*m_off > M3_MAX_OFFSET &&
*m_len >= M4_MAX_LEN + 1 && *m_len <= M2_MAX_LEN + 2 &&
swd->best_off[*m_len-2] && swd->best_off[*m_len-2] <= M2_MAX_OFFSET)
{
if (*m_off > M3_MAX_OFFSET
&& *m_len >= M4_MAX_LEN + 1 && *m_len <= M2_MAX_LEN + 2
&& swd->best_off[*m_len-2] && swd->best_off[*m_len-2] <= M2_MAX_OFFSET
) {
*m_len = *m_len - 2;
*m_off = swd->best_off[*m_len];
return;
}
/* M4 -> M3 */
if (*m_off > M3_MAX_OFFSET &&
*m_len >= M4_MAX_LEN + 1 && *m_len <= M3_MAX_LEN + 1 &&
swd->best_off[*m_len-1] && swd->best_off[*m_len-1] <= M3_MAX_OFFSET)
{
if (*m_off > M3_MAX_OFFSET
&& *m_len >= M4_MAX_LEN + 1 && *m_len <= M3_MAX_LEN + 1
&& swd->best_off[*m_len-1] && swd->best_off[*m_len-1] <= M3_MAX_OFFSET
) {
*m_len = *m_len - 1;
*m_off = swd->best_off[*m_len];
}
@ -729,7 +731,7 @@ static int lzo1x_999_compress_internal(const uint8_t *in, unsigned in_len,
unsigned m_len, m_off;
lzo1x_999_t cc;
lzo1x_999_t *const c = &cc;
lzo_swd_p const swd = (lzo_swd_p) wrkmem;
const lzo_swd_p swd = (lzo_swd_p) wrkmem;
int r;
c->init = 0;
@ -766,15 +768,15 @@ static int lzo1x_999_compress_internal(const uint8_t *in, unsigned in_len,
assert(ii + lit == c->bp);
assert(swd->b_char == *(c->bp));
if ( m_len < 2 ||
(m_len == 2 && (m_off > M1_MAX_OFFSET || lit == 0 || lit >= 4)) ||
if (m_len < 2
|| (m_len == 2 && (m_off > M1_MAX_OFFSET || lit == 0 || lit >= 4))
/* Do not accept this match for compressed-data compatibility
* with LZO v1.01 and before
* [ might be a problem for decompress() and optimize() ]
*/
(m_len == 2 && op == out) ||
(op == out && lit == 0))
{
|| (m_len == 2 && op == out)
|| (op == out && lit == 0)
) {
/* a literal */
m_len = 0;
}

9
archival/lzop.c
View File

@ -166,9 +166,12 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
o_m1_a++;
}
/* test if a literal run follows */
else if (nl == 0 && ip[0] < 16 && ip[0] != 0 &&
(lit + 2 + ip[0] < 16))
{
else
if (nl == 0
&& ip[0] < 16
&& ip[0] != 0
&& (lit + 2 + ip[0] < 16)
) {
t = *ip++;
/* remove short run */
*litp &= ~3;

7
coreutils/dd.c
View File

@ -301,11 +301,14 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
if (ftruncate(ofd, seek * obs) < 0) {
struct stat st;
if (fstat(ofd, &st) < 0 || S_ISREG(st.st_mode) ||
S_ISDIR(st.st_mode))
if (fstat(ofd, &st) < 0
|| S_ISREG(st.st_mode)
|| S_ISDIR(st.st_mode)
) {
goto die_outfile;
}
}
}
} else {
outfile = bb_msg_standard_output;
}

8
editors/vi.c
View File

@ -1158,9 +1158,11 @@ static void colon(char *buf)
file_modified = 0;
last_file_modified = -1;
}
if ((cmd[0] == 'x' || cmd[1] == 'q' || cmd[1] == 'n' ||
cmd[0] == 'X' || cmd[1] == 'Q' || cmd[1] == 'N')
&& l == ch) {
if ((cmd[0] == 'x' || cmd[1] == 'q' || cmd[1] == 'n'
|| cmd[0] == 'X' || cmd[1] == 'Q' || cmd[1] == 'N'
)
&& l == ch
) {
editing = 0;
}
}

6
modutils/depmod.c
View File

@ -80,9 +80,11 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA
&& strncmp(ptr, "__ksymtab_", 10) == 0
) {
ptr += 10;
if (strncmp(ptr, "gpl", 3) == 0 ||
strcmp(ptr, "strings") == 0)
if (strncmp(ptr, "gpl", 3) == 0
|| strcmp(ptr, "strings") == 0
) {
continue;
}
llist_add_to(&info->symbols, xstrdup(ptr));
ptr += strlen(ptr);
}

16
modutils/modutils-24.c
View File

@ -865,19 +865,23 @@ arch_apply_relocation(struct obj_file *f,
break;
case R_H8_PCREL16:
v -= dot + 2;
if ((ElfW(Sword))v > 0x7fff ||
(ElfW(Sword))v < -(ElfW(Sword))0x8000)
if ((ElfW(Sword))v > 0x7fff
|| (ElfW(Sword))v < -(ElfW(Sword))0x8000
) {
ret = obj_reloc_overflow;
else
} else {
*(unsigned short *)loc = v;
}
break;
case R_H8_PCREL8:
v -= dot + 1;
if ((ElfW(Sword))v > 0x7f ||
(ElfW(Sword))v < -(ElfW(Sword))0x80)
if ((ElfW(Sword))v > 0x7f
|| (ElfW(Sword))v < -(ElfW(Sword))0x80
) {
ret = obj_reloc_overflow;
else
} else {
*(unsigned char *)loc = v;
}
break;
#elif defined(__i386__)

19
networking/libiproute/iproute.c
View File

@ -163,20 +163,27 @@ static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
memset(tb, 0, sizeof(tb));
parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len);
if (G_filter.rdst.family && inet_addr_match(&dst, &G_filter.rdst, G_filter.rdst.bitlen))
if (G_filter.rdst.family
&& inet_addr_match(&dst, &G_filter.rdst, G_filter.rdst.bitlen)
) {
return 0;
if (G_filter.mdst.family && G_filter.mdst.bitlen >= 0 &&
inet_addr_match(&dst, &G_filter.mdst, r->rtm_dst_len))
}
if (G_filter.mdst.family
&& G_filter.mdst.bitlen >= 0
&& inet_addr_match(&dst, &G_filter.mdst, r->rtm_dst_len)
) {
return 0;
if (G_filter.rsrc.family && inet_addr_match(&src, &G_filter.rsrc, G_filter.rsrc.bitlen))
}
if (G_filter.rsrc.family
&& inet_addr_match(&src, &G_filter.rsrc, G_filter.rsrc.bitlen)
) {
return 0;
}
if (G_filter.msrc.family && G_filter.msrc.bitlen >= 0
&& inet_addr_match(&src, &G_filter.msrc, r->rtm_src_len)
) {
return 0;
}
if (G_filter.flushb
&& r->rtm_family == AF_INET6
&& r->rtm_dst_len == 0

12
networking/libiproute/iprule.c
View File

@ -233,7 +233,8 @@ static int iprule_modify(int cmd, char **argv)
addattr_l(&req.n, sizeof(req), RTA_DST, &dst.data, dst.bytelen);
} else if (key == ARG_preference ||
key == ARG_order ||
key == ARG_priority) {
key == ARG_priority
) {
uint32_t pref;
NEXT_ARG();
pref = get_u32(*argv, "preference");
@ -256,7 +257,8 @@ static int iprule_modify(int cmd, char **argv)
invarg(*argv, "realms");
addattr32(&req.n, sizeof(req), RTA_FLOW, realm);
} else if (key == ARG_table ||
key == ARG_lookup) {
key == ARG_lookup
) {
uint32_t tid;
NEXT_ARG();
if (rtnl_rttable_a2n(&tid, *argv))
@ -264,11 +266,13 @@ static int iprule_modify(int cmd, char **argv)
req.r.rtm_table = tid;
table_ok = 1;
} else if (key == ARG_dev ||
key == ARG_iif) {
key == ARG_iif
) {
NEXT_ARG();
addattr_l(&req.n, sizeof(req), RTA_IIF, *argv, strlen(*argv)+1);
} else if (key == ARG_nat ||
key == ARG_map_to) {
key == ARG_map_to
) {
NEXT_ARG();
addattr32(&req.n, sizeof(req), RTA_GATEWAY, get_addr32(*argv));
req.r.rtm_type = RTN_NAT;

19
networking/libiproute/iptunnel.c
View File

@ -204,19 +204,22 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p)
NEXT_ARG();
key = index_in_strings(keywords, *argv);
if (key == ARG_ipip ||
key == ARG_ip_ip) {
key == ARG_ip_ip
) {
if (p->iph.protocol && p->iph.protocol != IPPROTO_IPIP) {
bb_error_msg_and_die("%s tunnel mode", "you managed to ask for more than one");
}
p->iph.protocol = IPPROTO_IPIP;
} else if (key == ARG_gre ||
key == ARG_gre_ip) {
key == ARG_gre_ip
) {
if (p->iph.protocol && p->iph.protocol != IPPROTO_GRE) {
bb_error_msg_and_die("%s tunnel mode", "you managed to ask for more than one");
}
p->iph.protocol = IPPROTO_GRE;
} else if (key == ARG_sit ||
key == ARG_ip6_ip) {
key == ARG_ip6_ip
) {
if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) {
bb_error_msg_and_die("%s tunnel mode", "you managed to ask for more than one");
}
@ -297,7 +300,8 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p)
p->iph.ttl = uval;
}
} else if (key == ARG_tos ||
key == ARG_dsfield) {
key == ARG_dsfield
) {
uint32_t uval;
NEXT_ARG();
key = index_in_strings(keywords, *argv);
@ -485,7 +489,8 @@ static void do_tunnels_list(struct ip_tunnel_parm *p)
/*buf[sizeof(buf) - 1] = 0; - fgets is safe anyway */
ptr = strchr(buf, ':');
if (ptr == NULL ||
(*ptr++ = 0, sscanf(buf, "%s", name) != 1)) {
(*ptr++ = 0, sscanf(buf, "%s", name) != 1)
) {
bb_error_msg("wrong format of /proc/net/dev");
return;
}
@ -511,8 +516,10 @@ static void do_tunnels_list(struct ip_tunnel_parm *p)
(p->name[0] && strcmp(p1.name, p->name)) ||
(p->iph.daddr && p1.iph.daddr != p->iph.daddr) ||
(p->iph.saddr && p1.iph.saddr != p->iph.saddr) ||
(p->i_key && p1.i_key != p->i_key))
(p->i_key && p1.i_key != p->i_key)
) {
continue;
}
print_tunnel(&p1);
bb_putchar('\n');
}

6
networking/libiproute/libnetlink.c
View File

@ -147,7 +147,8 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
if (nladdr.nl_pid != 0 ||
h->nlmsg_pid != rth->local.nl_pid ||
h->nlmsg_seq != rth->dump) {
h->nlmsg_seq != rth->dump
) {
// if (junk) {
// err = junk(&nladdr, h, arg2);
// if (err < 0) {
@ -281,7 +282,8 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
if (nladdr.nl_pid != peer ||
h->nlmsg_pid != rtnl->local.nl_pid ||
h->nlmsg_seq != seq) {
h->nlmsg_seq != seq
) {
// if (junk) {
// l_err = junk(&nladdr, h, jarg);
// if (l_err < 0) {

5
networking/libiproute/ll_addr.c
View File

@ -22,8 +22,9 @@ const char* FAST_FUNC ll_addr_n2a(unsigned char *addr, int alen, int type, char
int i;
int l;
if (alen == 4 &&
(type == ARPHRD_TUNNEL || type == ARPHRD_SIT || type == ARPHRD_IPGRE)) {
if (alen == 4
&& (type == ARPHRD_TUNNEL || type == ARPHRD_SIT || type == ARPHRD_IPGRE)
) {
return inet_ntop(AF_INET, addr, buf, blen);
}
l = 0;

17
networking/tc.c
View File

@ -470,17 +470,22 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
msg.tcm_ifindex = xll_name_to_index(dev);
if (cmd >= CMD_show)
filter_ifindex = msg.tcm_ifindex;
} else if ((arg == ARG_qdisc && obj == OBJ_class && cmd >= CMD_show)
|| (arg == ARG_handle && obj == OBJ_qdisc
&& cmd == CMD_change)) {
} else
if ((arg == ARG_qdisc && obj == OBJ_class && cmd >= CMD_show)
|| (arg == ARG_handle && obj == OBJ_qdisc && cmd == CMD_change)
) {
NEXT_ARG();
/* We don't care about duparg2("qdisc handle",*argv) for now */
if (get_qdisc_handle(&filter_qdisc, *argv))
invarg(*argv, "qdisc");
} else if (obj != OBJ_qdisc &&
(arg == ARG_root
} else
if (obj != OBJ_qdisc
&& (arg == ARG_root
|| arg == ARG_parent
|| (obj == OBJ_filter && arg >= ARG_pref))) {
|| (obj == OBJ_filter && arg >= ARG_pref)
)
) {
/* nothing */
} else {
invarg(*argv, "command");
}

7
procps/pgrep.c
View File

@ -129,9 +129,10 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
continue;
/* NB: OPT_INVERT is always 0 or 1 */
if (!argv[0] ||
(regexec(&re_buffer, cmd, 1, re_match, 0) == 0 /* match found */
&& (!OPT_ANCHOR || (re_match[0].rm_so == 0 && re_match[0].rm_eo == (regoff_t)strlen(cmd)))) ^ OPT_INVERT
if (!argv[0]
|| (regexec(&re_buffer, cmd, 1, re_match, 0) == 0 /* match found */
&& (!OPT_ANCHOR || (re_match[0].rm_so == 0 && re_match[0].rm_eo == (regoff_t)strlen(cmd)))
) ^ OPT_INVERT
) {
matched_pid = proc->pid;
if (OPT_LAST) {

13
shell/lash_unused.c
View File

@ -950,8 +950,12 @@ static int parse_command(char **command_ptr, struct job *job, int *inbg)
*buf++ = '\\';
*buf++ = '\\';
}
} else if (*src == '*' || *src == '?' || *src == '[' ||
*src == ']') *buf++ = '\\';
} else
if (*src == '*' || *src == '?'
|| *src == '[' || *src == ']'
) {
*buf++ = '\\';
}
*buf++ = *src;
} else if (isspace(*src)) {
if (*prog->argv[argc_l] || (flag & LASH_OPT_SAW_QUOTE)) {
@ -1365,8 +1369,9 @@ static int busy_loop(FILE *input)
continue;
}
if (!parse_command(&next_command, &newjob, &inbg) &&
newjob.num_progs) {
if (!parse_command(&next_command, &newjob, &inbg)
&& newjob.num_progs
) {
int pipefds[2] = { -1, -1 };
debug_printf("job=%p fed to run_command by busy_loop()'\n",
&newjob);

7
shell/msh_unused.c
View File

@ -3873,9 +3873,10 @@ static char *blank(int f)
scanequals = 0;
for (;;) {
c = subgetc('"', foundequals);
if (c == 0 ||
f & (DOBLANK && any(c, ifs->value)) ||
(!INSUB() && any(c, "\"'"))) {
if (c == 0
|| f & (DOBLANK && any(c, ifs->value))
|| (!INSUB() && any(c, "\"'"))
) {
scanequals = 0;
unget(c);
if (any(c, "\"'"))

8
util-linux/fsck_minix.c
View File

@ -898,8 +898,12 @@ static void check_zones(unsigned i)
if (inode_count[i] > 1) /* have we counted this file already? */
return;
inode = Inode1 + i;
if (!S_ISDIR(inode->i_mode) && !S_ISREG(inode->i_mode) &&
!S_ISLNK(inode->i_mode)) return;
if (!S_ISDIR(inode->i_mode)
&& !S_ISREG(inode->i_mode)
&& !S_ISLNK(inode->i_mode)
) {
return;
}
for (i = 0; i < 7; i++)
add_zone(i + inode->i_zone, &changed);
add_zone_ind(7 + inode->i_zone, &changed);

8
util-linux/mount.c
View File

@ -907,10 +907,12 @@ get_mountport(struct pmap *pm_mnt,
goto next;
if (version && version <= 2 && pmap->pml_map.pm_vers > 2)
goto next;
if (pmap->pml_map.pm_vers > MAX_NFSPROT ||
(proto && pm_mnt->pm_prot && pmap->pml_map.pm_prot != proto) ||
(port && pmap->pml_map.pm_port != port))
if (pmap->pml_map.pm_vers > MAX_NFSPROT
|| (proto && pm_mnt->pm_prot && pmap->pml_map.pm_prot != proto)
|| (port && pmap->pml_map.pm_port != port)
) {
goto next;
}
memcpy(pm_mnt, &pmap->pml_map, sizeof(*pm_mnt));
next:
pmap = pmap->pml_next;

6
util-linux/readprofile.c
View File

@ -176,9 +176,11 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
/* ignore any LEADING (before a '[tT]' symbol is found)
Absolute symbols */
if ((*mode == 'A' || *mode == '?') && total == 0) continue;
if (*mode != 'T' && *mode != 't' &&
*mode != 'W' && *mode != 'w')
if (*mode != 'T' && *mode != 't'
&& *mode != 'W' && *mode != 'w'
) {
break; /* only text is profiled */
}
if (indx >= len / sizeof(*buf))
bb_error_msg_and_die("profile address out of range. "

18
util-linux/volume_id/fat.c
View File

@ -173,18 +173,22 @@ int FAST_FUNC volume_id_probe_vfat(struct volume_id *id /*,uint64_t fat_partitio
*/
/* boot jump address check */
if ((vs->boot_jump[0] != 0xeb || vs->boot_jump[2] != 0x90) &&
vs->boot_jump[0] != 0xe9)
if ((vs->boot_jump[0] != 0xeb || vs->boot_jump[2] != 0x90)
&& vs->boot_jump[0] != 0xe9
) {
return -1;
}
/* heads check */
if (vs->heads == 0)
return -1;
/* cluster size check */
if (vs->sectors_per_cluster == 0 ||
(vs->sectors_per_cluster & (vs->sectors_per_cluster-1)))
if (vs->sectors_per_cluster == 0
|| (vs->sectors_per_cluster & (vs->sectors_per_cluster-1))
) {
return -1;
}
/* media check */
if (vs->media < 0xf8 && vs->media != 0xf0)
@ -197,9 +201,11 @@ int FAST_FUNC volume_id_probe_vfat(struct volume_id *id /*,uint64_t fat_partitio
valid:
/* sector size check */
sector_size_bytes = le16_to_cpu(vs->sector_size_bytes);
if (sector_size_bytes != 0x200 && sector_size_bytes != 0x400 &&
sector_size_bytes != 0x800 && sector_size_bytes != 0x1000)
if (sector_size_bytes != 0x200 && sector_size_bytes != 0x400
&& sector_size_bytes != 0x800 && sector_size_bytes != 0x1000
) {
return -1;
}
dbg("sector_size_bytes 0x%x", sector_size_bytes);
dbg("sectors_per_cluster 0x%x", vs->sectors_per_cluster);

6
util-linux/volume_id/unused_msdos.c
View File

@ -73,9 +73,11 @@ int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id, uint64_t of
/* check flags on all entries for a valid partition table */
part = (struct msdos_partition_entry*) &buf[MSDOS_PARTTABLE_OFFSET];
for (i = 0; i < 4; i++) {
if (part[i].boot_ind != 0 &&
part[i].boot_ind != 0x80)
if (part[i].boot_ind != 0
&& part[i].boot_ind != 0x80
) {
return -1;
}
if (part[i].nr_sects != 0)
empty = 0;