Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Sunxi Tools
Commits
a95d7e18
Commit
a95d7e18
authored
May 15, 2013
by
Henrik Nordstrom
Browse files
nand_part: Reduce duplicated code a bit
parent
e76e9985
Changes
1
Show whitespace changes
Inline
Side-by-side
nand-part.c
View file @
a95d7e18
...
@@ -130,6 +130,23 @@ __s32 _free_mbr(MBR *mbr)
...
@@ -130,6 +130,23 @@ __s32 _free_mbr(MBR *mbr)
return
0
;
return
0
;
}
}
void
printmbr
(
MBR
*
mbr
)
{
int
part_cnt
;
for
(
part_cnt
=
0
;
part_cnt
<
mbr
->
PartCount
&&
part_cnt
<
MAX_PART_COUNT
;
part_cnt
++
)
{
if
(
1
||
(
mbr
->
array
[
part_cnt
].
user_type
==
2
)
||
(
mbr
->
array
[
part_cnt
].
user_type
==
0
))
{
printf
(
"partition %2d: class = %12s, name = %12s, partition start = %8d, partition size = %8d user_type=%d
\n
"
,
part_cnt
,
mbr
->
array
[
part_cnt
].
classname
,
mbr
->
array
[
part_cnt
].
name
,
mbr
->
array
[
part_cnt
].
addrlo
,
mbr
->
array
[
part_cnt
].
lenlo
,
mbr
->
array
[
part_cnt
].
user_type
);
}
}
}
void
checkmbrs
(
int
fd
)
void
checkmbrs
(
int
fd
)
{
{
int
part_cnt
=
0
;
int
part_cnt
=
0
;
...
@@ -152,17 +169,7 @@ void checkmbrs(int fd)
...
@@ -152,17 +169,7 @@ void checkmbrs(int fd)
return
;
return
;
}
}
for
(
part_cnt
=
0
;
part_cnt
<
mbr
->
PartCount
&&
part_cnt
<
MAX_PART_COUNT
;
part_cnt
++
)
printmbr
(
mbr
);
{
if
(
1
||
(
mbr
->
array
[
part_cnt
].
user_type
==
2
)
||
(
mbr
->
array
[
part_cnt
].
user_type
==
0
))
{
printf
(
"partition %2d: name = %12s, partition start = %8d, partition size = %8d
\n
"
,
part_cnt
,
mbr
->
array
[
part_cnt
].
name
,
mbr
->
array
[
part_cnt
].
addrlo
,
mbr
->
array
[
part_cnt
].
lenlo
);
}
}
for
(
i
=
0
;
i
<
MBR_COPY_NUM
;
i
++
)
{
for
(
i
=
0
;
i
<
MBR_COPY_NUM
;
i
++
)
{
if
(
mbrs
[
i
])
if
(
mbrs
[
i
])
_free_mbr
(
mbrs
[
i
]);
_free_mbr
(
mbrs
[
i
]);
...
@@ -233,17 +240,7 @@ int writembrs(int fd, char names[][MAX_NAME], __u32 *lens, unsigned int *user_ty
...
@@ -233,17 +240,7 @@ int writembrs(int fd, char names[][MAX_NAME], __u32 *lens, unsigned int *user_ty
}
}
printf
(
"
\n
ready to write new partition tables:
\n
"
);
printf
(
"
\n
ready to write new partition tables:
\n
"
);
for
(
part_cnt
=
0
;
part_cnt
<
mbr
->
PartCount
&&
part_cnt
<
MAX_PART_COUNT
;
part_cnt
++
)
printmbr
(
mbr
);
{
if
(
1
||
(
mbr
->
array
[
part_cnt
].
user_type
==
2
)
||
(
mbr
->
array
[
part_cnt
].
user_type
==
0
))
{
printf
(
"partition %2d: name = %12s, partition start = %8d, partition size = %8d
\n
"
,
part_cnt
,
mbr
->
array
[
part_cnt
].
name
,
mbr
->
array
[
part_cnt
].
addrlo
,
mbr
->
array
[
part_cnt
].
lenlo
);
}
}
for
(
i
=
0
;
i
<
MBR_COPY_NUM
;
i
++
)
{
for
(
i
=
0
;
i
<
MBR_COPY_NUM
;
i
++
)
{
if
(
mbrs
[
i
])
if
(
mbrs
[
i
])
_free_mbr
(
mbrs
[
i
]);
_free_mbr
(
mbrs
[
i
]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment