From 1060d575903284c53197cdfdfc96a5e7ef66d043 Mon Sep 17 00:00:00 2001 From: ballen4705 <ballen4705@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Sun, 16 Nov 2003 16:59:23 +0000 Subject: [PATCH] code janitor work: eliminated unused parameter from scsiPrintMain git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1240 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- sm5/scsiprint.c | 4 ++-- sm5/scsiprint.cpp | 4 ++-- sm5/scsiprint.h | 4 ++-- sm5/smartctl.c | 4 ++-- sm5/smartctl.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sm5/scsiprint.c b/sm5/scsiprint.c index 08a02a6f3..bfe5e1bab 100644 --- a/sm5/scsiprint.c +++ b/sm5/scsiprint.c @@ -40,7 +40,7 @@ #define GBUF_SIZE 65535 -const char* scsiprint_c_cvsid="$Id: scsiprint.c,v 1.59 2003/11/16 12:19:04 dpgilbert Exp $" +const char* scsiprint_c_cvsid="$Id: scsiprint.c,v 1.60 2003/11/16 16:59:23 ballen4705 Exp $" EXTERN_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID; // control block which points to external global control variables @@ -804,7 +804,7 @@ static void failuretest(int type, int returnvalue) } /* Main entry point used by smartctl command. Return 0 for success */ -int scsiPrintMain(const char * dev_name, int fd) +int scsiPrintMain(int fd) { int checkedSupportedLogPages = 0; UINT8 peripheral_type = 0; diff --git a/sm5/scsiprint.cpp b/sm5/scsiprint.cpp index 2a49e6c84..483cc90c4 100644 --- a/sm5/scsiprint.cpp +++ b/sm5/scsiprint.cpp @@ -40,7 +40,7 @@ #define GBUF_SIZE 65535 -const char* scsiprint_c_cvsid="$Id: scsiprint.cpp,v 1.59 2003/11/16 12:19:04 dpgilbert Exp $" +const char* scsiprint_c_cvsid="$Id: scsiprint.cpp,v 1.60 2003/11/16 16:59:23 ballen4705 Exp $" EXTERN_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID; // control block which points to external global control variables @@ -804,7 +804,7 @@ static void failuretest(int type, int returnvalue) } /* Main entry point used by smartctl command. Return 0 for success */ -int scsiPrintMain(const char * dev_name, int fd) +int scsiPrintMain(int fd) { int checkedSupportedLogPages = 0; UINT8 peripheral_type = 0; diff --git a/sm5/scsiprint.h b/sm5/scsiprint.h index f748462e4..e8a04533d 100644 --- a/sm5/scsiprint.h +++ b/sm5/scsiprint.h @@ -30,12 +30,12 @@ #ifndef SCSI_PRINT_H_ #define SCSI_PRINT_H_ -#define SCSIPRINT_H_CVSID "$Id: scsiprint.h,v 1.15 2003/10/12 09:10:03 ballen4705 Exp $\n" +#define SCSIPRINT_H_CVSID "$Id: scsiprint.h,v 1.16 2003/11/16 16:59:23 ballen4705 Exp $\n" // MACROS to control printing behavior (from ataprint.h) #define QUIETON(control) {if (control->quietmode) control->veryquietmode=0;} #define QUIETOFF(control) {if (control->quietmode && !control->veryquietmode) control->veryquietmode=1;} -int scsiPrintMain(const char * dev_name, int fd); +int scsiPrintMain(int fd); #endif diff --git a/sm5/smartctl.c b/sm5/smartctl.c index fbac2a520..e80e9f494 100644 --- a/sm5/smartctl.c +++ b/sm5/smartctl.c @@ -43,7 +43,7 @@ #include "utility.h" extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *scsiprint_c_cvsid, *utility_c_cvsid; -const char* smartctl_c_cvsid="$Id: smartctl.c,v 1.104 2003/10/27 11:23:32 ballen4705 Exp $" +const char* smartctl_c_cvsid="$Id: smartctl.c,v 1.105 2003/11/16 16:59:23 ballen4705 Exp $" ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID; // This is a block containing all the "control variables". We declare @@ -836,7 +836,7 @@ int main (int argc, char **argv){ if (tryata) retval = ataPrintMain(fd); else if (tryscsi) - retval = scsiPrintMain(device, fd); + retval = scsiPrintMain(fd); else { pout("Smartctl: specify if this is an ATA or SCSI device with the -d option.\n"); UsageSummary(); diff --git a/sm5/smartctl.cpp b/sm5/smartctl.cpp index 8aa04a72d..6ccf0a168 100644 --- a/sm5/smartctl.cpp +++ b/sm5/smartctl.cpp @@ -43,7 +43,7 @@ #include "utility.h" extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *scsiprint_c_cvsid, *utility_c_cvsid; -const char* smartctl_c_cvsid="$Id: smartctl.cpp,v 1.104 2003/10/27 11:23:32 ballen4705 Exp $" +const char* smartctl_c_cvsid="$Id: smartctl.cpp,v 1.105 2003/11/16 16:59:23 ballen4705 Exp $" ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID; // This is a block containing all the "control variables". We declare @@ -836,7 +836,7 @@ int main (int argc, char **argv){ if (tryata) retval = ataPrintMain(fd); else if (tryscsi) - retval = scsiPrintMain(device, fd); + retval = scsiPrintMain(fd); else { pout("Smartctl: specify if this is an ATA or SCSI device with the -d option.\n"); UsageSummary(); -- GitLab