Lines under 80 chars

Author: PEP 7

python-ethtool/etherinfo.c

@@ -46,11 +46,13 @@
 
 
 /**
- *  libnl callback function.  Does the real parsing of a record returned by NETLINK.  This function
- *  parses LINK related packets
+ *  libnl callback function.
+ *  Does the real parsing of a record returned by NETLINK.
+ *  This function parses LINK related packets
  *
  * @param obj   Pointer to a struct nl_object response
- * @param arg   Pointer to a struct etherinfo element where the parse result will be saved
+ * @param arg   Pointer to a struct etherinfo element where the parse result
+ *              will be saved
  */
 static void callback_nl_link(struct nl_object *obj, void *arg)
 {
@@ -72,11 +74,12 @@ static void callback_nl_link(struct nl_object *obj, void *arg)
 
 
 /**
- *  libnl callback function.  Does the real parsing of a record returned by NETLINK.  This function
- *  parses ADDRESS related packets
+ *  libnl callback function.  Does the real parsing of a record returned by
+ *  NETLINK.  This function parses ADDRESS related packets
  *
  * @param obj   Pointer to a struct nl_object response
- * @param arg   Pointer to a struct etherinfo element where the parse result will be saved
+ * @param arg   Pointer to a struct etherinfo element where the parse result
+ *              will be saved
  */
 static void callback_nl_address(struct nl_object *obj, void *arg)
 {
@@ -109,12 +112,15 @@ static void callback_nl_address(struct nl_object *obj, void *arg)
 
 
 /**
- * Sets the etherinfo.index member to the corresponding device set in etherinfo.device
+ * Sets the etherinfo.index member to the corresponding device set in
+ * etherinfo.device
  *
- * @param self A pointer the current PyEtherInfo Python object which contains the device name
- *               and the place where to save the corresponding index value.
+ * @param self A pointer the current PyEtherInfo Python object which contains
+ *             the device name and the place where to save the corresponding
+ *             index value.
  *
- * @return Returns 1 on success, otherwise 0.  On error, a Python error exception is set.
+ * @return Returns 1 on success, otherwise 0.  On error, a Python error
+ *         exception is set.
  */
 static int _set_device_index(PyEtherInfo *self)
 {
@@ -126,7 +132,8 @@ static int _set_device_index(PyEtherInfo *self)
      * interface index if we have that
      */
     if (self->index < 0) {
-        if ((errno = rtnl_link_alloc_cache(get_nlc(), AF_UNSPEC, &link_cache)) < 0) {
+        if ((errno = rtnl_link_alloc_cache(get_nlc(),
+                                           AF_UNSPEC, &link_cache)) < 0) {
             PyErr_SetString(PyExc_OSError, nl_geterror(errno));
             return 0;
         }
@@ -160,7 +167,8 @@ static int _set_device_index(PyEtherInfo *self)
  */
 
 /**
- * Populate the PyEtherInfo Python object with link information for the current device
+ * Populate the PyEtherInfo Python object with link information for the current
+ * device
  *
  * @param self  Pointer to the device object, a PyEtherInfo Python object
  *
@@ -200,7 +208,8 @@ int get_etherinfo_link(PyEtherInfo *self)
         return 0;
     }
     rtnl_link_set_ifindex(link, self->index);
-    nl_cache_foreach_filter(link_cache, OBJ_CAST(link), callback_nl_link, self);
+    nl_cache_foreach_filter(link_cache, OBJ_CAST(link),
+                            callback_nl_link, self);
     rtnl_link_put(link);
     nl_cache_free(link_cache);
 
@@ -212,12 +221,13 @@ int get_etherinfo_link(PyEtherInfo *self)
 /**
  * Query NETLINK for device IP address configuration
  *
- * @param self   A PyEtherInfo Python object for the current device to retrieve IP address
- *               configuration data from
- * @param query  What to query for.  Must be NLQRY_ADDR4 for IPv4 addresses or NLQRY_ADDR6
- *               for IPv6 addresses.
+ * @param self   A PyEtherInfo Python object for the current device to retrieve
+ *               IP address configuration data from
+ * @param query  What to query for.  Must be NLQRY_ADDR4 for IPv4 addresses or
+ *               NLQRY_ADDR6 for IPv6 addresses.
  *
- * @return Returns a Python list containing PyNetlinkIPaddress objects on success, otherwise NULL
+ * @return Returns a Python list containing PyNetlinkIPaddress objects on
+ *         success, otherwise NULL
  */
 PyObject * get_etherinfo_address(PyEtherInfo *self, nlQuery query)
 {
@@ -277,7 +287,8 @@ PyObject * get_etherinfo_address(PyEtherInfo *self, nlQuery query)
     assert(addrlist);
 
     /* Loop through all configured addresses */
-    nl_cache_foreach_filter(addr_cache, OBJ_CAST(addr), callback_nl_address, addrlist);
+    nl_cache_foreach_filter(addr_cache, OBJ_CAST(addr),
+                            callback_nl_address, addrlist);
     rtnl_addr_put(addr);
     nl_cache_free(addr_cache);
 

python-ethtool/etherinfo.h

@@ -17,7 +17,8 @@
 #ifndef _ETHERINFO_H
 #define _ETHERINFO_H
 
-typedef enum {NLQRY_ADDR4, NLQRY_ADDR6} nlQuery;  /**<  Supported query types in the etherinfo code */
+/** Supported query types in the etherinfo code */
+typedef enum {NLQRY_ADDR4, NLQRY_ADDR6} nlQuery;
 
 int get_etherinfo_link(PyEtherInfo *data);
 PyObject * get_etherinfo_address(PyEtherInfo *self, nlQuery query);

python-ethtool/etherinfo_obj.c

@@ -71,7 +71,8 @@ static PyNetlinkIPaddress * get_last_ipv4_address(PyObject *addrlist)
 
     size = PyList_Size(addrlist);
     if (size > 0) {
-        PyNetlinkIPaddress *item = (PyNetlinkIPaddress *)PyList_GetItem(addrlist, size - 1);
+        PyNetlinkIPaddress *item = (PyNetlinkIPaddress *)
+             PyList_GetItem(addrlist, size - 1);
         if (Py_TYPE(item) == &ethtool_netlink_ip_address_Type) {
             return item;
         }
@@ -81,7 +82,8 @@ static PyNetlinkIPaddress * get_last_ipv4_address(PyObject *addrlist)
 }
 
 /**
- * Creates a human readable format of the information when object is being treated as a string
+ * Creates a human readable format of the information when object is being
+ * treated as a string
  *
  * @param self  Pointer to the current PyEtherInfo device object
  *
@@ -111,14 +113,17 @@ PyObject *_ethtool_etherinfo_str(PyEtherInfo *self)
     if (ipv4addrs) {
         Py_ssize_t i;
         for (i = 0; i < PyList_Size(ipv4addrs); i++) {
-            PyNetlinkIPaddress *py_addr = (PyNetlinkIPaddress *)PyList_GetItem(ipv4addrs, i);
+            PyNetlinkIPaddress *py_addr = (PyNetlinkIPaddress *)
+                PyList_GetItem(ipv4addrs, i);
             PyObject *tmp = PyStr_FromFormat("\tIPv4 address: ");
             tmp = PyStr_Concat(tmp, py_addr->local);
-            tmp = PyStr_Concat(tmp, PyStr_FromFormat("/%d", py_addr->prefixlen));
+            tmp = PyStr_Concat(tmp,
+                               PyStr_FromFormat("/%d", py_addr->prefixlen));
             if (py_addr->ipv4_broadcast) {
-                tmp = PyStr_Concat(tmp,
-                                   PyStr_FromFormat("\tBroadcast: %s\n",
-                                                    PyStr_AsString(py_addr->ipv4_broadcast)));
+                tmp = PyStr_Concat(
+                    tmp, PyStr_FromFormat("\tBroadcast: %s\n",
+                                          PyStr_AsString(
+                                            py_addr->ipv4_broadcast)));
             } else {
                 tmp = PyStr_Concat(tmp, PyStr_FromFormat("\n"));
             }
@@ -131,7 +136,8 @@ PyObject *_ethtool_etherinfo_str(PyEtherInfo *self)
     if (ipv6addrs) {
         Py_ssize_t i;
         for (i = 0; i < PyList_Size(ipv6addrs); i++) {
-            PyNetlinkIPaddress *py_addr = (PyNetlinkIPaddress *)PyList_GetItem(ipv6addrs, i);
+            PyNetlinkIPaddress *py_addr = (PyNetlinkIPaddress *)
+                PyList_GetItem(ipv6addrs, i);
             PyObject *tmp = PyStr_FromFormat("\tIPv6 address: [%s] %s/%d\n",
                                              PyStr_AsString(py_addr->scope),
                                              PyStr_AsString(py_addr->local),
@@ -146,12 +152,14 @@ PyObject *_ethtool_etherinfo_str(PyEtherInfo *self)
 /**
  * Returns a tuple list of configured IPv4 addresses
  *
- * @param self     Pointer to the current PyEtherInfo device object to extract IPv4 info from
+ * @param self     Pointer to the current PyEtherInfo device object to extract
+ *                 IPv4 info from
  * @param notused
  *
  * @return Returns a Python tuple list of NetlinkIP4Address objects
  */
-static PyObject *_ethtool_etherinfo_get_ipv4_addresses(PyEtherInfo *self, PyObject *notused) {
+static PyObject *_ethtool_etherinfo_get_ipv4_addresses(PyEtherInfo *self,
+                                                       PyObject *notused) {
     if (!self) {
         PyErr_SetString(PyExc_AttributeError, "No data available");
         return NULL;
@@ -164,12 +172,14 @@ static PyObject *_ethtool_etherinfo_get_ipv4_addresses(PyEtherInfo *self, PyObje
 /**
  * Returns a tuple list of configured IPv6 addresses
  *
- * @param self     Pointer to the current PyEtherInfo device object to extract IPv6 info from
+ * @param self     Pointer to the current PyEtherInfo device object to extract
+ *                 IPv6 info from
  * @param notused
  *
  * @return Returns a Python tuple list of NetlinkIP6Address objects
  */
-static PyObject *_ethtool_etherinfo_get_ipv6_addresses(PyEtherInfo *self, PyObject *notused) {
+static PyObject *_ethtool_etherinfo_get_ipv6_addresses(PyEtherInfo *self,
+                                                       PyObject *notused) {
     if (!self) {
         PyErr_SetString(PyExc_AttributeError, "No data available");
         return NULL;
@@ -184,11 +194,15 @@ static PyObject *_ethtool_etherinfo_get_ipv6_addresses(PyEtherInfo *self, PyObje
  *
  */
 static PyMethodDef _ethtool_etherinfo_methods[] = {
-    {   "get_ipv4_addresses", (PyCFunction)_ethtool_etherinfo_get_ipv4_addresses, METH_NOARGS,
-        "Retrieve configured IPv4 addresses.  Returns a list of NetlinkIPaddress objects"
+    {   "get_ipv4_addresses",
+        (PyCFunction)_ethtool_etherinfo_get_ipv4_addresses, METH_NOARGS,
+        "Retrieve configured IPv4 addresses.  "
+        "Returns a list of NetlinkIPaddress objects"
     },
-    {   "get_ipv6_addresses", (PyCFunction)_ethtool_etherinfo_get_ipv6_addresses, METH_NOARGS,
-        "Retrieve configured IPv6 addresses.  Returns a list of NetlinkIPaddress objects"
+    {   "get_ipv6_addresses",
+        (PyCFunction)_ethtool_etherinfo_get_ipv6_addresses, METH_NOARGS,
+        "Retrieve configured IPv6 addresses.  "
+        "Returns a list of NetlinkIPaddress objects"
     },
     {NULL}  /**< No methods defined */
 };

python-ethtool/etherinfo_struct.h

@@ -34,7 +34,7 @@ typedef struct PyNetlinkIPaddress {
     int family;  /**< int: must be AF_INET or AF_INET6 */
     PyObject *local;  /**< string: Configured local IP address */
     PyObject *peer;  /**< string: Configured peer IP address */
-    PyObject *ipv4_broadcast;  /**< string: Configured IPv4 broadcast address */
+    PyObject *ipv4_broadcast;  /**< string: Configured IPv4 broadcast add. */
     int prefixlen;  /**< int: Configured network prefix (netmask) */
     PyObject *scope;  /**< string: IP address scope */
 } PyNetlinkIPaddress;

python-ethtool/ethtool-copy.h

@@ -272,10 +272,10 @@ struct ethtool_stats {
 #define ETHTOOL_SRINGPARAM  0x00000011  /* Set ring parameters, priv. */
 #define ETHTOOL_GPAUSEPARAM 0x00000012  /* Get pause parameters */
 #define ETHTOOL_SPAUSEPARAM 0x00000013  /* Set pause parameters, priv. */
-#define ETHTOOL_GRXCSUM     0x00000014  /* Get RX hw csum enable (ethtool_value) */
-#define ETHTOOL_SRXCSUM     0x00000015  /* Set RX hw csum enable (ethtool_value) */
-#define ETHTOOL_GTXCSUM     0x00000016  /* Get TX hw csum enable (ethtool_value) */
-#define ETHTOOL_STXCSUM     0x00000017  /* Set TX hw csum enable (ethtool_value) */
+#define ETHTOOL_GRXCSUM     0x00000014  /* Get RX hw csum enable (e.v.) */
+#define ETHTOOL_SRXCSUM     0x00000015  /* Set RX hw csum enable (e.v.) */
+#define ETHTOOL_GTXCSUM     0x00000016  /* Get TX hw csum enable (e.v.) */
+#define ETHTOOL_STXCSUM     0x00000017  /* Set TX hw csum enable (e.v.) */
 #define ETHTOOL_GSG         0x00000018  /* Get scatter-gather enable
                                          * (ethtool_value) */
 #define ETHTOOL_SSG         0x00000019  /* Set scatter-gather enable
@@ -284,12 +284,12 @@ struct ethtool_stats {
 #define ETHTOOL_GSTRINGS    0x0000001b  /* get specified string set */
 #define ETHTOOL_PHYS_ID     0x0000001c  /* identify the NIC */
 #define ETHTOOL_GSTATS      0x0000001d  /* get NIC-specific statistics */
-#define ETHTOOL_GTSO        0x0000001e  /* Get TSO enable (ethtool_value) */
-#define ETHTOOL_STSO        0x0000001f  /* Set TSO enable (ethtool_value) */
-#define ETHTOOL_GUFO        0x00000021  /* Get UFO enable (ethtool_value) */
-#define ETHTOOL_SUFO        0x00000022  /* Set UFO enable (ethtool_value) */
-#define ETHTOOL_GGSO        0x00000023  /* Get GSO enable (ethtool_value) */
-#define ETHTOOL_SGSO        0x00000024  /* Set GSO enable (ethtool_value) */
+#define ETHTOOL_GTSO        0x0000001e  /* Get TSO enable (e.v.) */
+#define ETHTOOL_STSO        0x0000001f  /* Set TSO enable (e.v.) */
+#define ETHTOOL_GUFO        0x00000021  /* Get UFO enable (e.v.) */
+#define ETHTOOL_SUFO        0x00000022  /* Set UFO enable (e.v.) */
+#define ETHTOOL_GGSO        0x00000023  /* Get GSO enable (e.v.) */
+#define ETHTOOL_SGSO        0x00000024  /* Set GSO enable (e.v.) */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET ETHTOOL_GSET