On 2/26/13 12:47 PM, Goffredo Baroncelli wrote:
> On 02/25/2013 11:54 PM, Eric Sandeen wrote:
>> The coverity had a false positive complaining that save_ptr
>> is uninitialized in the call to strtok_r.
>>
>> We could initialize it, but Zach points out that just using
>> strsep is a lot simpler if there's only one delimiter,
>> so just switch to that.
>>
>> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
>> ---
>> cmds-balance.c | 12 ++++--------
>> 1 files changed, 4 insertions(+), 8 deletions(-)
>>
>> diff --git a/cmds-balance.c b/cmds-balance.c
>> index b671e1d..e8b9d90 100644
>> --- a/cmds-balance.c
>> +++ b/cmds-balance.c
>> @@ -67,11 +67,9 @@ static int parse_one_profile(const char *profile, u64 *flags)
>> static int parse_profiles(char *profiles, u64 *flags)
>> {
>> char *this_char;
>> - char *save_ptr;
>>
>> - for (this_char = strtok_r(profiles, "|", &save_ptr);
>> - this_char != NULL;
>> - this_char = strtok_r(NULL, "|", &save_ptr)) {
>> + while ((this_char = strsep(&profiles, "|"))) {
>> + printf("got profile %s\n", this_char);
>
> In the original code the printf() doesn't exist. May be this is a
> residual of a debugging code ?
Argh, yes. Let me resend, thank you.
-Eric
>
>> if (parse_one_profile(this_char, flags))
>> return 1;
>> }
>> @@ -136,14 +134,12 @@ static int parse_filters(char *filters, struct btrfs_balance_args *args)
>> {
>> char *this_char;
>> char *value;
>> - char *save_ptr;
>>
>> if (!filters)
>> return 0;
>>
>> - for (this_char = strtok_r(filters, ",", &save_ptr);
>> - this_char != NULL;
>> - this_char = strtok_r(NULL, ",", &save_ptr)) {
>> + while ((this_char = strsep(&filters , ","))) {
>> + printf("got %s\n", this_char);
>
> Same here
>
>> if ((value = strchr(this_char, '=')) != NULL)
>> *value++ = 0;
>> if (!strcmp(this_char, "profiles")) {
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
