From d9c4769c442125d6bb5d6dc2aecbdcae75618ac4 Mon Sep 17 00:00:00 2001 From: anonymous Date: Sat, 21 Apr 2018 23:18:19 -0400 Subject: [PATCH] fixed lintian errors - changed section, fixed doxygen building of manpage --- debian/changelog | 7 +++++++ debian/control | 2 +- libcpuid/libcpuid.h | 42 +++++++++++++++++++++--------------------- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index 273342c..e6e0c74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libcpuid (0.4.0+ubuntu1~1) artful; urgency=low + + * built for artful + * got rid of lintian errors + + -- Jeffrey Cliff Fri, 20 Apr 2018 15:39:37 +0600 + libcpuid (0.4.0) unstable; urgency=low * Better detection of AMD clock multiplier with msrinfo. diff --git a/debian/control b/debian/control index b70c5da..1e0b48c 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: libcpuid -Section: utils +Section: libs Priority: optional Maintainer: Zhang, Guodong Build-Depends: debhelper (>= 9), autotools-dev, libtool, automake, autoconf, python, doxygen diff --git a/libcpuid/libcpuid.h b/libcpuid/libcpuid.h index f99c0fe..413c988 100644 --- a/libcpuid/libcpuid.h +++ b/libcpuid/libcpuid.h @@ -60,7 +60,7 @@ */ /** @mainpage A simple libcpuid introduction - * + * * LibCPUID provides CPU identification and access to the CPUID and RDTSC * instructions on the x86. *

@@ -82,6 +82,7 @@ */ /** @defgroup libcpuid LibCPUID + * @brief LibCPUID provides CPU identification @{ */ /* Include some integer type specifications: */ @@ -535,23 +536,23 @@ typedef enum { * @brief Describes common library error codes */ typedef enum { - ERR_OK = 0, /*!< "No error" */ - ERR_NO_CPUID = -1, /*!< "CPUID instruction is not supported" */ - ERR_NO_RDTSC = -2, /*!< "RDTSC instruction is not supported" */ - ERR_NO_MEM = -3, /*!< "Memory allocation failed" */ - ERR_OPEN = -4, /*!< "File open operation failed" */ - ERR_BADFMT = -5, /*!< "Bad file format" */ - ERR_NOT_IMP = -6, /*!< "Not implemented" */ - ERR_CPU_UNKN = -7, /*!< "Unsupported processor" */ - ERR_NO_RDMSR = -8, /*!< "RDMSR instruction is not supported" */ - ERR_NO_DRIVER= -9, /*!< "RDMSR driver error (generic)" */ - ERR_NO_PERMS = -10, /*!< "No permissions to install RDMSR driver" */ - ERR_EXTRACT = -11, /*!< "Cannot extract RDMSR driver (read only media?)" */ - ERR_HANDLE = -12, /*!< "Bad handle" */ - ERR_INVMSR = -13, /*!< "Invalid MSR" */ - ERR_INVCNB = -14, /*!< "Invalid core number" */ - ERR_HANDLE_R = -15, /*!< "Error on handle read" */ - ERR_INVRANGE = -16, /*!< "Invalid given range" */ + ERR_OK = 0, /*!< No error */ + ERR_NO_CPUID = -1, /*!< CPUID instruction is not supported */ + ERR_NO_RDTSC = -2, /*!< RDTSC instruction is not supported */ + ERR_NO_MEM = -3, /*!< Memory allocation failed */ + ERR_OPEN = -4, /*!< File open operation failed */ + ERR_BADFMT = -5, /*!< Bad file format */ + ERR_NOT_IMP = -6, /*!< Not implemented */ + ERR_CPU_UNKN = -7, /*!< Unsupported processor */ + ERR_NO_RDMSR = -8, /*!< RDMSR instruction is not supported */ + ERR_NO_DRIVER= -9, /*!< RDMSR driver error (generic) */ + ERR_NO_PERMS = -10, /*!< No permissions to install RDMSR driver */ + ERR_EXTRACT = -11, /*!< Cannot extract RDMSR driver (read only media?) */ + ERR_HANDLE = -12, /*!< Bad handle */ + ERR_INVMSR = -13, /*!< Invalid MSR */ + ERR_INVCNB = -14, /*!< Invalid core number */ + ERR_HANDLE_R = -15, /*!< Error on handle read */ + ERR_INVRANGE = -16, /*!< Invalid given range */ } cpu_error_t; /** @@ -1108,9 +1109,9 @@ int cpu_msrinfo(struct msr_driver_t* handle, cpu_msrinfo_request_t which); /** * @brief Writes the raw MSR data to a text file - * @param data - a pointer to msr_driver_t structure * @param filename - the path of the file, where the serialized data should be * written. If empty, stdout will be used. + * @param handle - a handle to the MSR reader driver, as created by cpu_msr_driver_open ? * @note This is intended primarily for debugging. On some processor, which is * not currently supported or not completely recognized by cpu_identify, * one can still successfully get the raw data and write it to a file. @@ -1131,8 +1132,7 @@ int msr_serialize_raw_data(struct msr_driver_t* handle, const char* filename); * This function unloads the MSR driver opened by cpu_msr_driver_open and * frees any resources associated with it. * - * @param handle - a handle to the MSR reader driver, as created by - * cpu_msr_driver_open + * @param handle - a handle to the MSR reader driver, as created by cpu_msr_driver_open * * @returns zero if successful, and some negative number on error. * The error message can be obtained by calling \ref cpuid_error.