LU-3204 build: clean up unused variables and dead code

[fs/lustre-release.git] / lnet / lnet / api-ni.c

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index 1df7cca..97bb5e7 100644 (file)
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -125,34 +125,16 @@ lnet_get_networks (void)
 {
         static char       default_networks[256];
         char             *networks = getenv ("LNET_NETWORKS");
-        char             *ip2nets  = getenv ("LNET_IP2NETS");
         char             *str;
         char             *sep;
         int               len;
         int               nob;
-        int               rc;
         cfs_list_t       *tmp;
 
-#ifdef NOT_YET
-        if (networks != NULL && ip2nets != NULL) {
-                LCONSOLE_ERROR_MSG(0x103, "Please set EITHER 'LNET_NETWORKS' or"
-                                   " 'LNET_IP2NETS' but not both at once\n");
-                return NULL;
-        }
-
-        if (ip2nets != NULL) {
-                rc = lnet_parse_ip2nets(&networks, ip2nets);
-                return (rc == 0) ? networks : NULL;
-        }
-#else
-        SET_BUT_UNUSED(ip2nets);
-        SET_BUT_UNUSED(rc);
-#endif
         if (networks != NULL)
                 return networks;
 
         /* In userland, the default 'networks=' is the list of known net types */
-
         len = sizeof(default_networks);
         str = default_networks;
         *str = 0;
@@ -163,13 +145,12 @@ lnet_get_networks (void)
 
                 nob = snprintf(str, len, "%s%s", sep,
                                libcfs_lnd2str(lnd->lnd_type));
+               if (nob >= len) {
+                       /* overflowed the string; leave it where it was */
+                       *str = 0;
+                       break;
+               }
                 len -= nob;
-                if (len < 0) {
-                        /* overflowed the string; leave it where it was */
-                        *str = 0;
-                        break;
-                }
-
                 str += nob;
                 sep = ",";
         }