Commit b39c18fc authored by J. Bruce Fields's avatar J. Bruce Fields

sunrpc: gss: simplify rsi_parse logic

Make an obvious simplification that removes a few lines and some
unnecessary indentation; no change in behavior.
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 16141c02
...@@ -224,38 +224,34 @@ static int rsi_parse(struct cache_detail *cd, ...@@ -224,38 +224,34 @@ static int rsi_parse(struct cache_detail *cd,
/* major/minor */ /* major/minor */
len = qword_get(&mesg, buf, mlen); len = qword_get(&mesg, buf, mlen);
if (len < 0) if (len <= 0)
goto out; goto out;
if (len == 0) { rsii.major_status = simple_strtoul(buf, &ep, 10);
if (*ep)
goto out;
len = qword_get(&mesg, buf, mlen);
if (len <= 0)
goto out;
rsii.minor_status = simple_strtoul(buf, &ep, 10);
if (*ep)
goto out; goto out;
} else {
rsii.major_status = simple_strtoul(buf, &ep, 10);
if (*ep)
goto out;
len = qword_get(&mesg, buf, mlen);
if (len <= 0)
goto out;
rsii.minor_status = simple_strtoul(buf, &ep, 10);
if (*ep)
goto out;
/* out_handle */ /* out_handle */
len = qword_get(&mesg, buf, mlen); len = qword_get(&mesg, buf, mlen);
if (len < 0) if (len < 0)
goto out; goto out;
status = -ENOMEM; status = -ENOMEM;
if (dup_to_netobj(&rsii.out_handle, buf, len)) if (dup_to_netobj(&rsii.out_handle, buf, len))
goto out; goto out;
/* out_token */ /* out_token */
len = qword_get(&mesg, buf, mlen); len = qword_get(&mesg, buf, mlen);
status = -EINVAL; status = -EINVAL;
if (len < 0) if (len < 0)
goto out; goto out;
status = -ENOMEM; status = -ENOMEM;
if (dup_to_netobj(&rsii.out_token, buf, len)) if (dup_to_netobj(&rsii.out_token, buf, len))
goto out; goto out;
}
rsii.h.expiry_time = expiry; rsii.h.expiry_time = expiry;
rsip = rsi_update(&rsii, rsip); rsip = rsi_update(&rsii, rsip);
status = 0; status = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment