[Crash-utility] [PATCH] tree: help fixes and -t radix vs. -l mutual exclusivity check

[Daniel Vacek]

On Wed, Apr 18, 2018 at 3:41 PM, Dave Anderson <anderson at redhat.com> wrote:
> ----- Original Message -----
>
> ... [ cut ] ...
>
>> diff --git a/tools.c b/tools.c
>> index cd8947147480..b09e564fd3cc 100644
>> --- a/tools.c
>> +++ b/tools.c
>> @@ -3946,6 +3946,10 @@ cmd_tree()
>>
>>                       break;
>>
>> +             case 'l':
>> +                     td->flags |= TREE_LINEAR_ORDER;
>> +                     break;
>> +
>>               case 'r':
>>                       if (td->flags & TREE_ROOT_OFFSET_ENTERED)
>>                               error(FATAL,
>> @@ -3993,10 +3997,6 @@ cmd_tree()
>>                       td->flags |= TREE_POSITION_DISPLAY;
>>                       break;
>>
>> -             case 'l':
>> -                     td->flags |= TREE_LINEAR_ORDER;
>> -                     break;
>> -
>>               case 'N':
>>                       td->flags |= TREE_NODE_POINTER;
>>                       break;
>> @@ -4023,6 +4023,9 @@ cmd_tree()
>>       if (argerrs)
>>               cmd_usage(pc->curcmd, SYNOPSIS);
>>
>> +     if ((type_flag & RADIXTREE_REQUEST) && (td->flags |= TREE_LINEAR_ORDER))
>> +             error(INFO, "-l option does not apply for radix trees, ignoring\n");
>> +
>
> Cut-and-paste error above, should be "& TREE_LINEAR_ORDER".  Instead of ignoring it,
> I also made it FATAL like the following one:

Oops, true. Sorry about that. Funny enough it did pass my testing.

>>       if ((type_flag & RADIXTREE_REQUEST) && (td->flags & TREE_NODE_OFFSET_ENTERED))
>>               error(FATAL, "-o option is not applicable to radix trees\n");
>
> Queued for crash-7.2.2:
>
>   https://github.com/crash-utility/crash/commit/9aa345148cc67ddaefb256e2c29f9bed8d776d15

Thanks

--nX

> Thanks,
>   Dave
>
>