ifs and fors with space after, no spaces inside the paren

PEP 7 · hroncok · commit c1e934effe57 · 2017-04-07T15:35:35.000+02:00
diff --git a/python-ethtool/etherinfo.c b/python-ethtool/etherinfo.c
@@ -58,13 +58,13 @@ static void callback_nl_link(struct nl_object *obj, void *arg)
     struct rtnl_link *link = (struct rtnl_link *) obj;
     char hwaddr[130];
 
-    if( (ethi == NULL) || (ethi->hwaddress != NULL) ) {
+    if ((ethi == NULL) || (ethi->hwaddress != NULL)) {
         return;
     }
 
     memset(&hwaddr, 0, 130);
     nl_addr2str(rtnl_link_get_addr(link), hwaddr, sizeof(hwaddr));
-    if( ethi->hwaddress ) {
+    if (ethi->hwaddress) {
         Py_XDECREF(ethi->hwaddress);
     }
     ethi->hwaddress = PyStr_FromFormat("%s", hwaddr);
@@ -85,15 +85,15 @@ static void callback_nl_address(struct nl_object *obj, void *arg)
     PyObject *addr_obj = NULL;
     int af_family = -1;
 
-    if( py_addrlist == NULL ) {
+    if (py_addrlist == NULL) {
         return;
     }
 
     /* Ensure that we're processing only known address types.
      * Currently only IPv4 and IPv6 is handled
      */
     af_family = rtnl_addr_get_family(rtaddr);
-    if( af_family != AF_INET && af_family != AF_INET6 ) {
+    if (af_family != AF_INET && af_family != AF_INET6) {
         return;
     }
 
@@ -125,20 +125,20 @@ static int _set_device_index(PyEtherInfo *self)
      * As we don't expect it to change, we're reusing a "cached"
      * interface index if we have that
      */
-    if( self->index < 0 ) {
-        if( (errno = rtnl_link_alloc_cache(get_nlc(), AF_UNSPEC, &link_cache)) < 0) {
+    if (self->index < 0) {
+        if ((errno = rtnl_link_alloc_cache(get_nlc(), AF_UNSPEC, &link_cache)) < 0) {
             PyErr_SetString(PyExc_OSError, nl_geterror(errno));
             return 0;
         }
         link = rtnl_link_get_by_name(link_cache, PyStr_AsString(self->device));
-        if( !link ) {
+        if (!link) {
             errno = ENODEV;
             PyErr_SetFromErrno(PyExc_IOError);
             nl_cache_free(link_cache);
             return 0;
         }
         self->index = rtnl_link_get_ifindex(link);
-        if( self->index <= 0 ) {
+        if (self->index <= 0) {
             errno = ENODEV;
             PyErr_SetFromErrno(PyExc_IOError);
             rtnl_link_put(link);
@@ -172,29 +172,29 @@ int get_etherinfo_link(PyEtherInfo *self)
     struct rtnl_link *link;
     int err = 0;
 
-    if( !self ) {
+    if (!self) {
         return 0;
     }
 
     /* Open a NETLINK connection on-the-fly */
-    if( !open_netlink(self) ) {
+    if (!open_netlink(self)) {
         PyErr_Format(PyExc_RuntimeError,
                      "Could not open a NETLINK connection for %s",
                      PyStr_AsString(self->device));
         return 0;
     }
 
-    if( _set_device_index(self) != 1) {
+    if (_set_device_index(self) != 1) {
         return 0;
     }
 
     /* Extract MAC/hardware address of the interface */
-    if( (err = rtnl_link_alloc_cache(get_nlc(), AF_UNSPEC, &link_cache)) < 0) {
+    if ((err = rtnl_link_alloc_cache(get_nlc(), AF_UNSPEC, &link_cache)) < 0) {
         PyErr_SetString(PyExc_OSError, nl_geterror(err));
         return 0;
     }
     link = rtnl_link_alloc();
-    if( !link ) {
+    if (!link) {
         errno = ENOMEM;
         PyErr_SetFromErrno(PyExc_OSError);
         return 0;
@@ -226,12 +226,12 @@ PyObject * get_etherinfo_address(PyEtherInfo *self, nlQuery query)
     PyObject *addrlist = NULL;
     int err = 0;
 
-    if( !self ) {
+    if (!self) {
         return NULL;
     }
 
     /* Open a NETLINK connection on-the-fly */
-    if( !open_netlink(self) ) {
+    if (!open_netlink(self)) {
         PyErr_Format(PyExc_RuntimeError,
                      "Could not open a NETLINK connection for %s",
                      PyStr_AsString(self->device));
@@ -244,22 +244,22 @@ PyObject * get_etherinfo_address(PyEtherInfo *self, nlQuery query)
 
     /* Query the for requested info via NETLINK */
     /* Extract IP address information */
-    if( (err = rtnl_addr_alloc_cache(get_nlc(), &addr_cache)) < 0) {
+    if ((err = rtnl_addr_alloc_cache(get_nlc(), &addr_cache)) < 0) {
         PyErr_SetString(PyExc_OSError, nl_geterror(err));
         nl_cache_free(addr_cache);
         return NULL;
     }
 
     addr = rtnl_addr_alloc();
 
-    if( !addr ) {
+    if (!addr) {
         errno = ENOMEM;
         PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
     rtnl_addr_set_ifindex(addr, self->index);
 
-    switch( query ) {
+    switch( query) {
     case NLQRY_ADDR4:
         rtnl_addr_set_family(addr, AF_INET);
         break;
diff --git a/python-ethtool/etherinfo_obj.c b/python-ethtool/etherinfo_obj.c
@@ -92,7 +92,7 @@ PyObject *_ethtool_etherinfo_str(PyEtherInfo *self)
     PyObject *ret = NULL;
     PyObject *ipv4addrs = NULL, *ipv6addrs = NULL;
 
-    if( !self ) {
+    if (!self) {
         PyErr_SetString(PyExc_AttributeError, "No data available");
         return NULL;
     }
@@ -101,21 +101,21 @@ PyObject *_ethtool_etherinfo_str(PyEtherInfo *self)
 
     ret = PyStr_FromFormat("Device %s:\n", PyStr_AsString(self->device));
 
-    if( self->hwaddress ) {
+    if (self->hwaddress) {
         ret = PyStr_Concat(ret,
                            PyStr_FromFormat("\tMAC address: %s\n",
                                             PyStr_AsString(self->hwaddress)));
     }
 
     ipv4addrs = get_etherinfo_address(self, NLQRY_ADDR4);
-    if( ipv4addrs ) {
+    if (ipv4addrs) {
         Py_ssize_t i;
         for (i = 0; i < PyList_Size(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));
-            if (py_addr->ipv4_broadcast ) {
+            if (py_addr->ipv4_broadcast) {
                 tmp = PyStr_Concat(tmp,
                                    PyStr_FromFormat("\tBroadcast: %s\n",
                                                     PyStr_AsString(py_addr->ipv4_broadcast)));
@@ -128,7 +128,7 @@ PyObject *_ethtool_etherinfo_str(PyEtherInfo *self)
     }
 
     ipv6addrs = get_etherinfo_address(self, NLQRY_ADDR6);
-    if( ipv6addrs ) {
+    if (ipv6addrs) {
         Py_ssize_t i;
         for (i = 0; i < PyList_Size(ipv6addrs); i++) {
             PyNetlinkIPaddress *py_addr = (PyNetlinkIPaddress *)PyList_GetItem(ipv6addrs, i);
@@ -152,7 +152,7 @@ PyObject *_ethtool_etherinfo_str(PyEtherInfo *self)
  * @return Returns a Python tuple list of NetlinkIP4Address objects
  */
 static PyObject *_ethtool_etherinfo_get_ipv4_addresses(PyEtherInfo *self, PyObject *notused) {
-    if( !self ) {
+    if (!self) {
         PyErr_SetString(PyExc_AttributeError, "No data available");
         return NULL;
     }
@@ -170,7 +170,7 @@ static PyObject *_ethtool_etherinfo_get_ipv4_addresses(PyEtherInfo *self, PyObje
  * @return Returns a Python tuple list of NetlinkIP6Address objects
  */
 static PyObject *_ethtool_etherinfo_get_ipv6_addresses(PyEtherInfo *self, PyObject *notused) {
-    if( !self ) {
+    if (!self) {
         PyErr_SetString(PyExc_AttributeError, "No data available");
         return NULL;
     }
@@ -197,7 +197,7 @@ static PyObject *get_device(PyObject *obj, void *info)
 {
     PyEtherInfo *self = (PyEtherInfo *) obj;
 
-    if( self->device ) {
+    if (self->device) {
         Py_INCREF(self->device);
         return self->device;
     }
@@ -209,7 +209,7 @@ static PyObject *get_mac_addr(PyObject *obj, void *info)
     PyEtherInfo *self = (PyEtherInfo *) obj;
 
     get_etherinfo_link(self);
-    if( self->hwaddress ) {
+    if (self->hwaddress) {
         Py_INCREF(self->hwaddress);
     }
     return self->hwaddress;
diff --git a/python-ethtool/ethtool.c b/python-ethtool/ethtool.c
@@ -91,7 +91,7 @@ static PyObject *get_devices(PyObject *self __unused, PyObject *args __unused)
     /* skip over first two lines */
     ret = fgets(buffer, 256, fd);
     ret = fgets(buffer, 256, fd);
-    if( !ret ) {
+    if (!ret) {
         return PyErr_SetFromErrno(PyExc_OSError);
     }
 
@@ -222,32 +222,32 @@ static PyObject *get_interfaces_info(PyObject *self __unused, PyObject *args) {
     }
 
     /* Parse input arguments if we got them */
-    if( inargs != NULL ) {
-        if( PyStr_Check(inargs) ) { /* Input argument is just a string */
+    if (inargs != NULL) {
+        if (PyStr_Check(inargs)) { /* Input argument is just a string */
             fetch_devs_len = 1;
             fetch_devs = calloc(1, sizeof(char *));
             fetch_devs[0] = PyStr_AsString(inargs);
 
-        } else if( PyTuple_Check(inargs) ) { /* Input argument is a tuple list with devices */
+        } else if (PyTuple_Check(inargs)) { /* Input argument is a tuple list with devices */
             int j = 0;
 
             fetch_devs_len = PyTuple_Size(inargs);
             fetch_devs = calloc(fetch_devs_len+1, sizeof(char *));
-            for( i = 0; i < fetch_devs_len; i++ ) {
+            for (i = 0; i < fetch_devs_len; i++) {
                 PyObject *elmt = PyTuple_GetItem(inargs, i);
-                if( elmt && PyStr_Check(elmt) ) {
+                if (elmt && PyStr_Check(elmt)) {
                     fetch_devs[j++] = PyStr_AsString(elmt);
                 }
             }
             fetch_devs_len = j;
-        } else if( PyList_Check(inargs) ) { /* Input argument is a list with devices */
+        } else if (PyList_Check(inargs)) { /* Input argument is a list with devices */
             int j = 0;
 
             fetch_devs_len = PyList_Size(inargs);
             fetch_devs = calloc(fetch_devs_len+1, sizeof(char *));
-            for( i = 0; i < fetch_devs_len; i++ ) {
+            for (i = 0; i < fetch_devs_len; i++) {
                 PyObject *elmt = PyList_GetItem(inargs, i);
-                if( elmt && PyStr_Check(elmt) ) {
+                if (elmt && PyStr_Check(elmt)) {
                     fetch_devs[j++] = PyStr_AsString(elmt);
                 }
             }
@@ -260,15 +260,15 @@ static PyObject *get_interfaces_info(PyObject *self __unused, PyObject *args) {
     }
 
     devlist = PyList_New(0);
-    for( i = 0; i < fetch_devs_len; i++ ) {
+    for (i = 0; i < fetch_devs_len; i++) {
         PyEtherInfo *dev = NULL;
 
         /* Store the device name and a reference to the NETLINK connection for
          * objects to use when quering for device info
          */
 
         dev = PyObject_New(PyEtherInfo, &PyEtherInfo_Type);
-        if( !dev ) {
+        if (!dev) {
             PyErr_SetFromErrno(PyExc_OSError);
             free(fetch_devs);
             return NULL;
diff --git a/python-ethtool/netlink-address.c b/python-ethtool/netlink-address.c
@@ -79,7 +79,7 @@ PyNetlinkIPaddress_from_rtnl_addr(struct rtnl_addr *addr)
     /* Set ipv4_broadcast: */
     py_obj->ipv4_broadcast = NULL;
     brdcst = rtnl_addr_get_broadcast(addr);
-    if( py_obj->family == AF_INET && brdcst ) {
+    if (py_obj->family == AF_INET && brdcst) {
         memset(&buf, 0, sizeof(buf));
         if (!inet_ntop(AF_INET, nl_addr_get_binary_addr(brdcst),
                        buf, sizeof(buf))) {
@@ -209,7 +209,7 @@ make_python_address_from_rtnl_addr(struct rtnl_addr *addr)
 {
     assert(addr);
 
-    switch( rtnl_addr_get_family(addr) ) {
+    switch( rtnl_addr_get_family(addr)) {
 
     case AF_INET:
     case AF_INET6:
diff --git a/python-ethtool/netlink.c b/python-ethtool/netlink.c
@@ -39,14 +39,14 @@ static unsigned int nlconnection_users = 0;  /* How many NETLINK users are activ
  */
 int open_netlink(PyEtherInfo *ethi)
 {
-    if( !ethi ) {
+    if (!ethi) {
         return 0;
     }
 
     /* Reuse already established NETLINK connection, if a connection exists */
-    if( nlconnection ) {
+    if (nlconnection) {
         /* If this object has not used NETLINK earlier, tag it as a user */
-        if( !ethi->nlc_active ) {
+        if (!ethi->nlc_active) {
             pthread_mutex_lock(&nlc_counter_mtx);
             nlconnection_users++;
             pthread_mutex_unlock(&nlc_counter_mtx);
@@ -57,12 +57,12 @@ int open_netlink(PyEtherInfo *ethi)
 
     /* No earlier connections exists, establish a new one */
     nlconnection = nl_socket_alloc();
-    if( nlconnection != NULL ) {
-        if( nl_connect(nlconnection, NETLINK_ROUTE) < 0 ) {
+    if (nlconnection != NULL) {
+        if (nl_connect(nlconnection, NETLINK_ROUTE) < 0) {
             return 0;
         }
         /* Force O_CLOEXEC flag on the NETLINK socket */
-        if( fcntl(nl_socket_get_fd(nlconnection), F_SETFD, FD_CLOEXEC) == -1 ) {
+        if (fcntl(nl_socket_get_fd(nlconnection), F_SETFD, FD_CLOEXEC) == -1) {
             fprintf(stderr,
                     "**WARNING** Failed to set O_CLOEXEC on NETLINK socket: %s\n",
                     strerror(errno));
@@ -99,7 +99,7 @@ struct nl_sock * get_nlc()
  */
 void close_netlink(PyEtherInfo *ethi)
 {
-    if( !ethi || !nlconnection ) {
+    if (!ethi || !nlconnection) {
         return;
     }
 
@@ -110,7 +110,7 @@ void close_netlink(PyEtherInfo *ethi)
     pthread_mutex_unlock(&nlc_counter_mtx);
 
     /* Don't close the connection if there are more users */
-    if( nlconnection_users > 0) {
+    if (nlconnection_users > 0) {
         return;
     }
 
