Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk

This commit is contained in:
Brian Behlendorf 2008-12-08 11:29:06 -08:00
parent c39199a4e1 5d31b4febd
commit 082a572553
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zfs/lib/libnvpair/libnvpair.c
View File

@ -565,7 +565,7 @@ nvpair_value_match_regex(nvpair_t *nvp, int ai,
boolean_t val, val_arg; boolean_t val, val_arg;
/* scanf boolean_t from value and check for match */ /* scanf boolean_t from value and check for match */
sr = sscanf(value, "%"SCNi32, &val_arg); sr = sscanf(value, "%"SCNi32, (int32_t *)&val_arg);
if ((sr == 1) && if ((sr == 1) &&
(nvpair_value_boolean_value(nvp, &val) == 0) && (nvpair_value_boolean_value(nvp, &val) == 0) &&
(val == val_arg)) (val == val_arg))
@ -576,7 +576,7 @@ nvpair_value_match_regex(nvpair_t *nvp, int ai,
boolean_t *val_array, val_arg; boolean_t *val_array, val_arg;
/* check indexed value of array for match */ /* check indexed value of array for match */
sr = sscanf(value, "%"SCNi32, &val_arg); sr = sscanf(value, "%"SCNi32, (int32_t *)&val_arg);
if ((sr == 1) && if ((sr == 1) &&
(nvpair_value_boolean_array(nvp, (nvpair_value_boolean_array(nvp,
&val_array, &a_len) == 0) && &val_array, &a_len) == 0) &&