From b48aba40f761118f0d0e4818221f10d5399d6cc6 Mon Sep 17 00:00:00 2001 From: shattered <shattered@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Wed, 20 Sep 2006 16:17:31 +0000 Subject: [PATCH] s/.c/.cpp/ in comments. git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@2266 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- sm5/knowndrives.cpp | 4 ++-- sm5/os_darwin.cpp | 4 ++-- sm5/os_generic.cpp | 10 +++++----- sm5/os_netbsd.cpp | 6 +++--- sm5/os_openbsd.cpp | 4 ++-- sm5/os_os2.cpp | 6 +++--- sm5/os_win32.cpp | 4 ++-- sm5/smartctl.cpp | 4 ++-- sm5/smartd.cpp | 8 ++++---- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sm5/knowndrives.cpp b/sm5/knowndrives.cpp index 539535bfa..296a833fd 100644 --- a/sm5/knowndrives.cpp +++ b/sm5/knowndrives.cpp @@ -26,14 +26,14 @@ #include "knowndrives.h" #include "utility.h" // includes <regex.h> -const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.142 2006/09/17 18:28:12 shattered Exp $" +const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.143 2006/09/20 16:17:31 shattered Exp $" ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID; #define MODEL_STRING_LENGTH 40 #define FIRMWARE_STRING_LENGTH 8 #define TABLEPRINTWIDTH 19 -// See vendorattributeargs[] array in atacmds.c for definitions. +// See vendorattributeargs[] array in atacmds.cpp for definitions. #define PRESET_9_MINUTES { 9, 1 } #define PRESET_9_TEMP { 9, 2 } #define PRESET_9_SECONDS { 9, 3 } diff --git a/sm5/os_darwin.cpp b/sm5/os_darwin.cpp index 44e1f2ea5..867f804da 100644 --- a/sm5/os_darwin.cpp +++ b/sm5/os_darwin.cpp @@ -43,7 +43,7 @@ #include "os_darwin.h" // Needed by '-V' option (CVS versioning) of smartd/smartctl -const char *os_XXXX_c_cvsid="$Id: os_darwin.cpp,v 1.17 2006/09/05 03:16:03 geoffk1 Exp $" \ +const char *os_XXXX_c_cvsid="$Id: os_darwin.cpp,v 1.18 2006/09/20 16:17:31 shattered Exp $" \ ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_DARWIN_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID; // Print examples for smartctl. @@ -300,7 +300,7 @@ int deviceclose(int fd){ return 0; } -// Interface to ATA devices. See os_linux.c for the cannonical example. +// Interface to ATA devices. See os_linux.cpp for the cannonical example. // DETAILED DESCRIPTION OF ARGUMENTS // device: is the integer handle provided by deviceopen() // command: defines the different operations, see atacmds.h diff --git a/sm5/os_generic.cpp b/sm5/os_generic.cpp index 46cab5480..2b9e33e0d 100644 --- a/sm5/os_generic.cpp +++ b/sm5/os_generic.cpp @@ -20,7 +20,7 @@ /* NOTE: The code in this file is only called when smartmontools has been compiled on an unrecognized/unsupported platform. This file - can then serve as a "template" to make os_myOS.c if you wish to + can then serve as a "template" to make os_myOS.cpp if you wish to build support for that platform. @@ -79,7 +79,7 @@ // should have one *_H_CVSID macro appearing below for each file // appearing with #include "*.h" above. Please list these (below) in // alphabetic/dictionary order. -const char *os_XXXX_c_cvsid="$Id: os_generic.cpp,v 1.23 2006/08/25 06:06:24 sxzzsf Exp $" \ +const char *os_XXXX_c_cvsid="$Id: os_generic.cpp,v 1.24 2006/09/20 16:17:31 shattered Exp $" \ ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_GENERIC_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID; @@ -119,7 +119,7 @@ static void unsupported(){ pout("\n" "############################################################################\n" "WARNING: smartmontools has not been ported to the %s Operating System.\n" - "Please see the files os_generic.c and os_generic.h for porting instructions.\n" + "Please see the files os_generic.cpp and os_generic.h for porting instructions.\n" "############################################################################\n\n", osname); debugmode=savedebugmode; @@ -185,7 +185,7 @@ int make_device_names (char*** devlist, const char* name) { // Like open(). Return non-negative integer handle, only used by the // functions below. type=="ATA" or "SCSI". If you need to store // extra information about your devices, create a private internal -// array within this file (see os_freebsd.c for an example). If you +// array within this file (see os_freebsd.cpp for an example). If you // can not open the device (permission denied, does not exist, etc) // set errno as open() does and return <0. int deviceopen(const char *pathname, char *type){ @@ -203,7 +203,7 @@ int deviceclose(int fd){ return 0; } -// Interface to ATA devices. See os_linux.c for the cannonical example. +// Interface to ATA devices. See os_linux.cpp for the cannonical example. // DETAILED DESCRIPTION OF ARGUMENTS // device: is the integer handle provided by deviceopen() // command: defines the different operations, see atacmds.h diff --git a/sm5/os_netbsd.cpp b/sm5/os_netbsd.cpp index a190f1742..8e179b3e2 100644 --- a/sm5/os_netbsd.cpp +++ b/sm5/os_netbsd.cpp @@ -1,5 +1,5 @@ /* - * os_netbsd.c + * os_netbsd.cpp * * Home page of code is: http://smartmontools.sourceforge.net * @@ -24,7 +24,7 @@ #include "os_netbsd.h" #include <unistd.h> -const char *os_XXXX_c_cvsid = "$Id: os_netbsd.cpp,v 1.18 2006/09/17 07:37:27 shattered Exp $" \ +const char *os_XXXX_c_cvsid = "$Id: os_netbsd.cpp,v 1.19 2006/09/20 16:17:31 shattered Exp $" \ ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_NETBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID; /* global variable holding byte count of allocated memory */ @@ -394,7 +394,7 @@ do_scsi_cmnd_io(int fd, struct scsi_cmnd_io * iop, int report) sc.senselen = iop->max_sense_len; sc.timeout = iop->timeout == 0 ? 60000 : (1000 * iop->timeout); sc.flags = - (iop->dxfer_dir == DXFER_NONE ? SCCMD_READ : /* XXX */ + (iop->dxfer_dir == DXFER_NONE ? SCCMD_READ : (iop->dxfer_dir == DXFER_FROM_DEVICE ? SCCMD_READ : SCCMD_WRITE)); if (ioctl(fd, SCIOCCOMMAND, &sc) < 0) { diff --git a/sm5/os_openbsd.cpp b/sm5/os_openbsd.cpp index 52bc234ed..c74b9aab6 100644 --- a/sm5/os_openbsd.cpp +++ b/sm5/os_openbsd.cpp @@ -5,7 +5,7 @@ * * Copyright (C) 2004-6 David Snyder <smartmontools-support@lists.sourceforge.net> * - * Derived from os_netbsd.c by Sergey Svishchev <smartmontools-support@lists.sourceforge.net>, Copyright (C) 2003-6 + * Derived from os_netbsd.cpp by Sergey Svishchev <smartmontools-support@lists.sourceforge.net>, Copyright (C) 2003-6 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ #include "utility.h" #include "os_openbsd.h" -const char *os_XXXX_c_cvsid = "$Id: os_openbsd.cpp,v 1.12 2006/09/19 07:22:09 snyderx Exp $" \ +const char *os_XXXX_c_cvsid = "$Id: os_openbsd.cpp,v 1.13 2006/09/20 16:17:31 shattered Exp $" \ ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_OPENBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID; /* global variable holding byte count of allocated memory */ diff --git a/sm5/os_os2.cpp b/sm5/os_os2.cpp index d6d0c3e3c..797de35b6 100644 --- a/sm5/os_os2.cpp +++ b/sm5/os_os2.cpp @@ -31,7 +31,7 @@ #include "os_os2.h" // Needed by '-V' option (CVS versioning) of smartd/smartctl -const char *os_XXXX_c_cvsid="$Id: os_os2.cpp,v 1.6 2006/08/25 06:06:25 sxzzsf Exp $" \ +const char *os_XXXX_c_cvsid="$Id: os_os2.cpp,v 1.7 2006/09/20 16:17:31 shattered Exp $" \ ATACMDS_H_CVSID OS_XXXX_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID; // global handle to device driver @@ -149,7 +149,7 @@ int make_device_names (char*** devlist, const char* name) { // Like open(). Return non-negative integer handle, only used by the // functions below. type=="ATA" or "SCSI". If you need to store // extra information about your devices, create a private internal -// array within this file (see os_freebsd.c for an example). If you +// array within this file (see os_freebsd.cpp for an example). If you // can not open the device (permission denied, does not exist, etc) // set errno as open() does and return <0. int deviceopen(const char *pathname, char *type){ @@ -335,7 +335,7 @@ int dani_ioctl( int device, int request, void* arg) return 0; } -// Interface to ATA devices. See os_linux.c for the cannonical example. +// Interface to ATA devices. See os_linux.cpp for the cannonical example. // DETAILED DESCRIPTION OF ARGUMENTS // device: is the integer handle provided by deviceopen() // command: defines the different operations, see atacmds.h diff --git a/sm5/os_win32.cpp b/sm5/os_win32.cpp index 3728df3b2..82be4a4bc 100644 --- a/sm5/os_win32.cpp +++ b/sm5/os_win32.cpp @@ -46,7 +46,7 @@ extern int64_t bytes; // malloc() byte count // Needed by '-V' option (CVS versioning) of smartd/smartctl -const char *os_XXXX_c_cvsid="$Id: os_win32.cpp,v 1.40 2006/08/25 06:06:25 sxzzsf Exp $" +const char *os_XXXX_c_cvsid="$Id: os_win32.cpp,v 1.41 2006/09/20 16:17:31 shattered Exp $" ATACMDS_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID; @@ -215,7 +215,7 @@ int make_device_names (char*** devlist, const char* type) // Like open(). Return positive integer handle, only used by // functions below. type="ATA" or "SCSI". If you need to store extra // information about your devices, create a private internal array -// within this file (see os_freebsd.c for an example). +// within this file (see os_freebsd.cpp for an example). int deviceopen(const char * pathname, char *type) { int len; diff --git a/sm5/smartctl.cpp b/sm5/smartctl.cpp index 533d28423..44591983e 100644 --- a/sm5/smartctl.cpp +++ b/sm5/smartctl.cpp @@ -50,7 +50,7 @@ extern const char *os_solaris_ata_s_cvsid; #endif 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.154 2006/09/15 08:03:52 sxzzsf Exp $" +const char* smartctl_c_cvsid="$Id: smartctl.cpp,v 1.155 2006/09/20 16:17:31 shattered Exp $" ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_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 @@ -889,7 +889,7 @@ void pout(const char *fmt, ...){ return; } -// This function is used by utility.c to report LOG_CRIT errors. +// This function is used by utility.cpp to report LOG_CRIT errors. // The smartctl version prints to stdout instead of syslog(). void PrintOut(int priority, const char *fmt, ...) { va_list ap; diff --git a/sm5/smartd.cpp b/sm5/smartd.cpp index e0581e1c6..05725c497 100644 --- a/sm5/smartd.cpp +++ b/sm5/smartd.cpp @@ -111,18 +111,18 @@ extern "C" int getdomainname(char *, int); // no declaration in header files! #define ARGUSED(x) ((void)(x)) -// These are CVS identification information for *.c and *.h files +// These are CVS identification information for *.cpp and *.h 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.cpp,v 1.377 2006/09/15 08:01:20 sxzzsf Exp $"; +static const char *filenameandversion="$Id: smartd.cpp,v 1.378 2006/09/20 16:17:31 shattered Exp $"; #ifdef NEED_SOLARIS_ATA_CODE extern const char *os_solaris_ata_s_cvsid; #endif #ifdef _WIN32 extern const char *daemon_win32_c_cvsid, *hostname_win32_c_cvsid, *syslog_win32_c_cvsid; #endif -const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.377 2006/09/15 08:01:20 sxzzsf Exp $" +const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.378 2006/09/20 16:17:31 shattered Exp $" ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID #ifdef DAEMON_WIN32_H_CVSID DAEMON_WIN32_H_CVSID @@ -946,7 +946,7 @@ void pout(const char *fmt, ...){ } // This function prints either to stdout or to the syslog as needed. -// This function is also used by utility.c to report LOG_CRIT errors. +// This function is also used by utility.cpp to report LOG_CRIT errors. void PrintOut(int priority, const char *fmt, ...){ va_list ap; -- GitLab