[PATCH v3] partitions: dos: Fix support of extended partition type 0x05

[Uwe Kleine-König]

On Mon, Dec 22, 2014 at 06:20:22PM +0100, Victorien Vedrine wrote:
> From: victorien <victorien.vedrine at ophrys.net>
> 
> Signed-off-by: Victorien Vedrine <victorien.vedrine at ophrys.net>
> ---
>  common/partitions/dos.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/common/partitions/dos.c b/common/partitions/dos.c
> index 37addfd..f02c822 100644
> --- a/common/partitions/dos.c
> +++ b/common/partitions/dos.c
> @@ -205,11 +205,11 @@ static void dos_partition(void *buf, struct block_device *blk,
>  			pd->used_entries++;
>  			/*
>  			 * Partitions of type 0x05 and 0x0f (and some more)
> -			 * contain extended partitions. Only check for type 0x0f
> -			 * here as this is the easiest to parse and common
> -			 * enough.
> +			 * contain extended partitions. Only check for type
> +			 * 0x05 and 0x0f.
the now removed comment implies that partitions of type 0x05 and 0x0f
are to be handled differently. With your change however they are handled
identically. Is this correct? Might be worth to explain in the commit
log.

>  			 */
> -			if (pentry.dos_partition_type == 0x0f) {
> +			if (pentry.dos_partition_type == 0x0f ||
> +				pentry.dos_partition_type == 0x05) {
There are two schools for indention in this case. Either use two tabs
more than the line above, or align the continuation at the opening
brace.

Are you using vim? Then add "filetype indent on" to your .vimrc and
depending on the way you want to handle the above case also add

	set cinoptions=(,:

for aligning with the opening brace, or

	set cinoptions=:

for the two tab preference.

Best regards
Uwe
-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |