Skip to content

Fix: camshr, for case when scsi host is > 9 and scsi linux device > 7 #2367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zack-vii merged 1 commit into from
Aug 26, 2021
Merged

Fix: camshr, for case when scsi host is > 9 and scsi linux device > 7 #2367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ tests-env:

# Interdependent directories:
actions: mdsshr tdishr treeshr xmdsshr mdstcpip servershr
camshr: mdsdcl
camshr: mdsdcl mdstcpip
ccl: camshr mdsshr mdsdcl
tcl: mdsshr treeshr tdishr mdstcpip servershr mdsdcl
dwscope: xmdsshr
Expand All @@ -234,7 +234,7 @@ java/jdispatcher: java/mdsobjects
java/jtraverser: java/mdsobjects java/jscope
java/jtraverser2: java/mdsplus-api
math: mdsshr
mdsdcl: mdsshr
mdsdcl: mdsshr treeshr
mdslib: mdstcpip
mdslibidl: tdishr
mdsmisc: tdishr xtreeshr
Expand Down
2 changes: 1 addition & 1 deletion camshr/QueryHighwayType.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ int QueryHighwayType(char *serial_hwy_driver)
{
if (strstr(line, "Host:"))
{
sscanf(line, "Host: scsi%1d Channel: %*2d Id: %2d", &tmpHost, &tmpId);
sscanf(line, "Host: scsi%d Channel: %*2d Id: %2d", &tmpHost, &tmpId);

if (tmpHost == host_adapter && tmpId == scsi_id)
{
Expand Down
2 changes: 1 addition & 1 deletion camshr/parse_crate_db.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void parse_crate_db(struct CRATE *in, struct Crate_ *out)
);

out->device = (in->DSFname[0] != '.')
? strtol(in->DSFname, NULL, 0) // valid /dev/sg#
? strtol(in->DSFname, NULL, 10) // valid /dev/sg#
: -1; // in-valid

out->type = in->HwyType; // highway type
Expand Down