Skip to content
Snippets Groups Projects
Commit 36dee614 authored by ballen4705's avatar ballen4705
Browse files

Eliminated .fd file descriptor field from data structures. No longer used.

git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@138 4ea69e1a-61f1-4043-bf83-b5c94c648137
parent e7e94309
No related branches found
No related tags found
No related merge requests found
CHANGELOG for smartmontools CHANGELOG for smartmontools
$Id: CHANGELOG,v 1.23 2002/10/26 09:24:26 ballen4705 Exp $ $Id: CHANGELOG,v 1.24 2002/10/26 09:38:26 ballen4705 Exp $
Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net> Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
...@@ -42,7 +42,8 @@ smartmontools-5.0-VERSION ...@@ -42,7 +42,8 @@ smartmontools-5.0-VERSION
since the fd to the device was open. smartd now opens the device since the fd to the device was open. smartd now opens the device
when it needs to read values, then closes it. Also, if one time when it needs to read values, then closes it. Also, if one time
around it can't open the device, it simply prints a warning around it can't open the device, it simply prints a warning
message but does not give up. message but does not give up. Have eliminated the .fd field from
data structures -- no longer gets used.
smartd now opens SCSI devices as well using O_RDONLY rather than smartd now opens SCSI devices as well using O_RDONLY rather than
O_RDWR. If someone can no longer monitor a SCSI device that used O_RDWR. If someone can no longer monitor a SCSI device that used
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
// CVS ID strings // CVS ID strings
extern const char *CVSid1, *CVSid2; extern const char *CVSid1, *CVSid2;
const char *CVSid3="$Id: smartd.c,v 1.32 2002/10/26 09:24:26 ballen4705 Exp $" const char *CVSid3="$Id: smartd.c,v 1.33 2002/10/26 09:38:26 ballen4705 Exp $"
CVSID1 CVSID4 CVSID7; CVSID1 CVSID4 CVSID7;
// This function prints either to stdout or to the syslog as needed // This function prints either to stdout or to the syslog as needed
...@@ -185,7 +185,6 @@ int atadevicescan (atadevices_t *devices, char *device){ ...@@ -185,7 +185,6 @@ int atadevicescan (atadevices_t *devices, char *device){
} }
printout(LOG_INFO,"%s Found and is SMART capable. Adding to \"monitor\" list.\n",device); printout(LOG_INFO,"%s Found and is SMART capable. Adding to \"monitor\" list.\n",device);
devices[numatadevices].fd = fd;
strcpy(devices[numatadevices].devicename, device); strcpy(devices[numatadevices].devicename, device);
devices[numatadevices].drive = drive; devices[numatadevices].drive = drive;
...@@ -244,7 +243,6 @@ int scsidevicescan (scsidevices_t *devices, char *device){ ...@@ -244,7 +243,6 @@ int scsidevicescan (scsidevices_t *devices, char *device){
// now we can proceed to register the device // now we can proceed to register the device
printout(LOG_INFO, "Device: %s, Found and is SMART capable. Adding to \"monitor\" list.\n",device); printout(LOG_INFO, "Device: %s, Found and is SMART capable. Adding to \"monitor\" list.\n",device);
devices[numscsidevices].fd = fd;
strcpy(devices[numscsidevices].devicename,device); strcpy(devices[numscsidevices].devicename,device);
// register the supported functionality. The smartd code does not // register the supported functionality. The smartd code does not
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
// CVS ID strings // CVS ID strings
extern const char *CVSid1, *CVSid2; extern const char *CVSid1, *CVSid2;
const char *CVSid3="$Id: smartd.cpp,v 1.32 2002/10/26 09:24:26 ballen4705 Exp $" const char *CVSid3="$Id: smartd.cpp,v 1.33 2002/10/26 09:38:26 ballen4705 Exp $"
CVSID1 CVSID4 CVSID7; CVSID1 CVSID4 CVSID7;
// This function prints either to stdout or to the syslog as needed // This function prints either to stdout or to the syslog as needed
...@@ -185,7 +185,6 @@ int atadevicescan (atadevices_t *devices, char *device){ ...@@ -185,7 +185,6 @@ int atadevicescan (atadevices_t *devices, char *device){
} }
printout(LOG_INFO,"%s Found and is SMART capable. Adding to \"monitor\" list.\n",device); printout(LOG_INFO,"%s Found and is SMART capable. Adding to \"monitor\" list.\n",device);
devices[numatadevices].fd = fd;
strcpy(devices[numatadevices].devicename, device); strcpy(devices[numatadevices].devicename, device);
devices[numatadevices].drive = drive; devices[numatadevices].drive = drive;
...@@ -244,7 +243,6 @@ int scsidevicescan (scsidevices_t *devices, char *device){ ...@@ -244,7 +243,6 @@ int scsidevicescan (scsidevices_t *devices, char *device){
// now we can proceed to register the device // now we can proceed to register the device
printout(LOG_INFO, "Device: %s, Found and is SMART capable. Adding to \"monitor\" list.\n",device); printout(LOG_INFO, "Device: %s, Found and is SMART capable. Adding to \"monitor\" list.\n",device);
devices[numscsidevices].fd = fd;
strcpy(devices[numscsidevices].devicename,device); strcpy(devices[numscsidevices].devicename,device);
// register the supported functionality. The smartd code does not // register the supported functionality. The smartd code does not
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
*/ */
#ifndef CVSID7 #ifndef CVSID7
#define CVSID7 "$Id: smartd.h,v 1.9 2002/10/26 09:24:26 ballen4705 Exp $\n" #define CVSID7 "$Id: smartd.h,v 1.10 2002/10/26 09:38:26 ballen4705 Exp $\n"
#endif #endif
// Configuration file // Configuration file
...@@ -57,7 +57,6 @@ unsigned char emailnotification = FALSE; ...@@ -57,7 +57,6 @@ unsigned char emailnotification = FALSE;
unsigned char printcopyleft = FALSE; unsigned char printcopyleft = FALSE;
typedef struct atadevices_s { typedef struct atadevices_s {
int fd;
int selftest; int selftest;
struct hd_driveid drive; struct hd_driveid drive;
struct ata_smart_values smartval; struct ata_smart_values smartval;
...@@ -66,7 +65,6 @@ typedef struct atadevices_s { ...@@ -66,7 +65,6 @@ typedef struct atadevices_s {
} atadevices_t; } atadevices_t;
typedef struct scsidevices_s { typedef struct scsidevices_s {
int fd;
unsigned char SmartPageSupported; unsigned char SmartPageSupported;
unsigned char TempPageSupported; unsigned char TempPageSupported;
unsigned char Temperature; unsigned char Temperature;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment