Page MenuHomeFreeBSD
Files F153180495

D40523.id123176.diff
No OneTemporary
Actions

D40523.id123176.diff
View Options

diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -127,8 +127,8 @@
/* unused 0x00000080 */
/* unused 0x00000100 */
/* unused 0x00000200 */
- CAM_ARG_PLIST = 0x00000400,
- CAM_ARG_GLIST = 0x00000800,
+ /* unused 0x00000400 */
+ /* unused 0x00000800 */
CAM_ARG_GET_SERIAL = 0x00001000,
CAM_ARG_GET_STDINQ = 0x00002000,
CAM_ARG_GET_XFERRATE = 0x00004000,
@@ -3856,7 +3856,7 @@
&entry_num, SCSI_NV_FLAG_IG_CASE);
if (status == SCSI_NV_FOUND) {
- list_format = defect_list_type_map[
+ list_format |= defect_list_type_map[
entry_num].value;
list_type_set = true;
} else {
@@ -3870,10 +3870,12 @@
break;
}
case 'G':
- arglist |= CAM_ARG_GLIST;
+ list_format |= SRDD10_GLIST;
+ lists_specified++;
break;
case 'P':
- arglist |= CAM_ARG_PLIST;
+ list_format |= SRDD10_PLIST;
+ lists_specified++;
break;
case 'q':
quiet = true;
@@ -3906,16 +3908,6 @@
goto defect_bailout;
}
- if (arglist & CAM_ARG_PLIST) {
- list_format |= SRDD10_PLIST;
- lists_specified++;
- }
-
- if (arglist & CAM_ARG_GLIST) {
- list_format |= SRDD10_GLIST;
- lists_specified++;
- }
-
/*
* This implies a summary, and was the previous behavior.
*/

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 3:47 PM (7 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31849010
Default Alt Text
D40523.id123176.diff (1 KB)

Event Timeline