diff --git a/sm5/atacmds.c b/sm5/atacmds.c
index 6579974d2a8546f9ba5df9e844febc9fdfa52a48..ef8fda5b7ab4cfdce07520b14848f3b37fd64cd7 100644
--- a/sm5/atacmds.c
+++ b/sm5/atacmds.c
@@ -35,7 +35,7 @@
 #include "extern.h"
 #include "utility.h"
 
-const char *atacmds_c_cvsid="$Id: atacmds.c,v 1.160.2.1 2004/08/16 23:57:19 ballen4705 Exp $"
+const char *atacmds_c_cvsid="$Id: atacmds.c,v 1.160.2.2 2004/08/18 16:21:07 ballen4705 Exp $"
 ATACMDS_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID UTILITY_H_CVSID;
 
 // to hold onto exit code for atexit routine
@@ -771,7 +771,7 @@ int ataVersionInfo (const char** description, struct ata_identify_device *drive,
   if (i==0)
     return 1;
   else
-    return i;;
+    return i;
 }
 
 // returns 1 if SMART supported, 0 if SMART unsupported, -1 if can't tell
diff --git a/sm5/os_freebsd.c b/sm5/os_freebsd.c
index 1729c46dd1b6cc7189170b8abfa35ec478b11acb..65d7738cfc7eb70e6291fc0e29109af4e680f331 100644
--- a/sm5/os_freebsd.c
+++ b/sm5/os_freebsd.c
@@ -35,9 +35,9 @@
 #include "utility.h"
 #include "os_freebsd.h"
 
-static const char *filenameandversion="$Id: os_freebsd.c,v 1.40.2.1 2004/08/16 23:57:19 ballen4705 Exp $";
+static const char *filenameandversion="$Id: os_freebsd.c,v 1.40.2.2 2004/08/18 16:21:20 ballen4705 Exp $";
 
-const char *os_XXXX_c_cvsid="$Id: os_freebsd.c,v 1.40.2.1 2004/08/16 23:57:19 ballen4705 Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_freebsd.c,v 1.40.2.2 2004/08/18 16:21:20 ballen4705 Exp $" \
 ATACMDS_H_CVSID CONFIG_H_CVSID OS_XXXX_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 // to hold onto exit code for atexit routine
@@ -771,7 +771,7 @@ static int parse_ata_chan_dev(const char * dev_name, struct freebsd_dev_channel
   
   // if dev_name null, or string length zero
   if (!dev_name || !(len = strlen(dev_name)))
-    return CONTROLLER_UNKNOWN;;
+    return CONTROLLER_UNKNOWN;
   
   // Remove the leading /dev/... if it's there
   if (!strncmp(fbsd_dev_prefix, dev_name, dev_prefix_len)) {
diff --git a/sm5/os_linux.c b/sm5/os_linux.c
index c45a12a3c13708af2aa7f6139ce9318bebb851aa..d72b9643c8f7ef2d1b24e1bd0833ba58e192d75a 100644
--- a/sm5/os_linux.c
+++ b/sm5/os_linux.c
@@ -70,9 +70,9 @@ typedef unsigned long long u8;
 
 #define ARGUSED(x) ((void)(x))
 
-static const char *filenameandversion="$Id: os_linux.c,v 1.70.2.1 2004/08/16 23:57:19 ballen4705 Exp $";
+static const char *filenameandversion="$Id: os_linux.c,v 1.70.2.2 2004/08/18 16:21:20 ballen4705 Exp $";
 
-const char *os_XXXX_c_cvsid="$Id: os_linux.c,v 1.70.2.1 2004/08/16 23:57:19 ballen4705 Exp $" \
+const char *os_XXXX_c_cvsid="$Id: os_linux.c,v 1.70.2.2 2004/08/18 16:21:20 ballen4705 Exp $" \
 ATACMDS_H_CVSID OS_XXXX_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
 
 // to hold onto exit code for atexit routine
@@ -488,7 +488,7 @@ int ata_command_interface(int device, smart_command_set command, int select, cha
     taskfile->feature        = ATA_SMART_WRITE_LOG_SECTOR;
     taskfile->sector_count   = 1;
     taskfile->sector_number  = select;
-    taskfile->low_cylinder   = 0x4f;;
+    taskfile->low_cylinder   = 0x4f;
     taskfile->high_cylinder  = 0xc2;
     taskfile->device_head    = 0;
     taskfile->command        = ATA_SMART_CMD;
diff --git a/sm5/smartd.c b/sm5/smartd.c
index 29fa884266f583d7fd5fb8e444059f40af8e24c2..0e5095b8fc1a98849bc0871800d04ae315da9fa5 100644
--- a/sm5/smartd.c
+++ b/sm5/smartd.c
@@ -108,7 +108,7 @@ int getdomainname(char *, int); /* no declaration in header files! */
 extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid, 
                   *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
 
-static const char *filenameandversion="$Id: smartd.c,v 1.333.2.3 2004/08/17 18:09:34 ballen4705 Exp $";
+static const char *filenameandversion="$Id: smartd.c,v 1.333.2.4 2004/08/18 16:21:20 ballen4705 Exp $";
 #ifdef NEED_SOLARIS_ATA_CODE
 extern const char *os_solaris_ata_s_cvsid;
 #endif
@@ -118,7 +118,7 @@ extern const char *daemon_win32_c_cvsid, *hostname_win32_c_cvsid, *syslog_win32_
 extern const char *int64_vc6_c_cvsid;
 #endif
 #endif
-const char *smartd_c_cvsid="$Id: smartd.c,v 1.333.2.3 2004/08/17 18:09:34 ballen4705 Exp $" 
+const char *smartd_c_cvsid="$Id: smartd.c,v 1.333.2.4 2004/08/18 16:21:20 ballen4705 Exp $" 
 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID
 #ifdef DAEMON_WIN32_H_CVSID
 DAEMON_WIN32_H_CVSID
@@ -1505,7 +1505,7 @@ int ATADeviceScan(cfgfile *cfg, int scanning){
   
     // record number of device, type of device, increment device count
   if (cfg->controller_type == CONTROLLER_UNKNOWN)
-    cfg->controller_type=CONTROLLER_ATA;;
+    cfg->controller_type=CONTROLLER_ATA;
   
   // close file descriptor
   CloseDevice(fd, name);