API: Use string type instead of u8.

[vpp.git] / src / vpp / vnet / main.c

diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c
index afe18c8..41f70d0 100644 (file)
--- a/src/vpp/vnet/main.c
+++ b/src/vpp/vnet/main.c
@@ -29,7 +29,7 @@
 /*
  * Load plugins from /usr/lib/vpp_plugins by default
  */
-char *vlib_plugin_path = "/usr/lib/vpp_plugins";
+char *vlib_plugin_path = NULL;
 char *vlib_plugin_app_version = VPP_BUILD_VER;
 
 static void
@@ -58,16 +58,10 @@ vpp_find_plugin_path ()
   *p = 0;
 
   s = format (0, "%s/lib/vpp_plugins", path);
-#if uword_bits == 64
-  s = format (s, ":%s/lib64/vpp_plugins", path);
-#endif
   vec_add1 (s, 0);
   vlib_plugin_path = (char *) s;
 
   s = format (0, "%s/lib/vpp_api_test_plugins", path);
-#if uword_bits == 64
-  s = format (s, ":%s/lib64/vpp_api_test_plugins", path);
-#endif
   vec_add1 (s, 0);
   vat_plugin_path = (char *) s;
 }
@@ -90,7 +84,8 @@ vpe_main_init (vlib_main_t * vm)
    */
   vat_plugin_hash_create ();
 
-  vpp_find_plugin_path ();
+  if (!vlib_plugin_path)
+    vpp_find_plugin_path ();
 }
 
 /*
@@ -161,10 +156,17 @@ main (int argc, char *argv[])
        }
       argv_ = calloc (1, sizeof (char *));
       if (argv_ == NULL)
-       return 1;
+       {
+         fclose (fp);
+         return 1;
+       }
       arg = strndup (argv[0], 1024);
       if (arg == NULL)
-       return 1;
+       {
+         fclose (fp);
+         free (argv_);
+         return 1;
+       }
       argv_[0] = arg;
 
       while (1)