Fixes for 'make UNATTENDED=yes CC=clang CXX=clang verify'

[vpp.git] / src / vlib / unix / util.c

diff --git a/src/vlib/unix/util.c b/src/vlib/unix/util.c
index 312cc9b..03aef36 100644 (file)
--- a/src/vlib/unix/util.c
+++ b/src/vlib/unix/util.c
@@ -73,7 +73,8 @@ foreach_directory_file (char *dir_name,
       if (scan_dirs)
        {
          if (e->d_type == DT_DIR
-             && (!strcmp (e->d_name, ".") || !strcmp (e->d_name, "..")))
+             && (!strncmp (e->d_name, ".", 1) ||
+                 !strncmp (e->d_name, "..", 2)))
            continue;
        }
       else
@@ -98,130 +99,6 @@ foreach_directory_file (char *dir_name,
   return error;
 }
 
-clib_error_t *
-vlib_sysfs_write (char *file_name, char *fmt, ...)
-{
-  u8 *s;
-  int fd;
-  clib_error_t *error = 0;
-
-  fd = open (file_name, O_WRONLY);
-  if (fd < 0)
-    return clib_error_return_unix (0, "open `%s'", file_name);
-
-  va_list va;
-  va_start (va, fmt);
-  s = va_format (0, fmt, &va);
-  va_end (va);
-
-  if (write (fd, s, vec_len (s)) < 0)
-    error = clib_error_return_unix (0, "write `%s'", file_name);
-
-  vec_free (s);
-  close (fd);
-  return error;
-}
-
-clib_error_t *
-vlib_sysfs_read (char *file_name, char *fmt, ...)
-{
-  unformat_input_t input;
-  u8 *s = 0;
-  int fd;
-  ssize_t sz;
-  uword result;
-
-  fd = open (file_name, O_RDONLY);
-  if (fd < 0)
-    return clib_error_return_unix (0, "open `%s'", file_name);
-
-  vec_validate (s, 4095);
-
-  sz = read (fd, s, vec_len (s));
-  if (sz < 0)
-    {
-      close (fd);
-      vec_free (s);
-      return clib_error_return_unix (0, "read `%s'", file_name);
-    }
-
-  _vec_len (s) = sz;
-  unformat_init_vector (&input, s);
-
-  va_list va;
-  va_start (va, fmt);
-  result = va_unformat (&input, fmt, &va);
-  va_end (va);
-
-  vec_free (s);
-  close (fd);
-
-  if (result == 0)
-    return clib_error_return (0, "unformat error");
-
-  return 0;
-}
-
-u8 *
-vlib_sysfs_link_to_name (char *link)
-{
-  char *p, buffer[64];
-  unformat_input_t in;
-  u8 *s = 0;
-  int r;
-
-  r = readlink (link, buffer, sizeof (buffer) - 1);
-
-  if (r < 0)
-    return 0;
-
-  buffer[r] = 0;
-  p = strrchr (buffer, '/');
-
-  if (!p)
-    return 0;
-
-  unformat_init_string (&in, p + 1, strlen (p + 1));
-  if (unformat (&in, "%s", &s) != 1)
-    clib_unix_warning ("no string?");
-  unformat_free (&in);
-
-  return s;
-}
-
-int
-vlib_sysfs_get_free_hugepages (unsigned int numa_node, int page_size)
-{
-  struct stat sb;
-  u8 *p = 0;
-  int r = -1;
-
-  p = format (p, "/sys/devices/system/node/node%u%c", numa_node, 0);
-
-  if (stat ((char *) p, &sb) == 0)
-    {
-      if (S_ISDIR (sb.st_mode) == 0)
-       goto done;
-    }
-  else if (numa_node == 0)
-    {
-      vec_reset_length (p);
-      p = format (p, "/sys/kernel/mm%c", 0);
-      if (stat ((char *) p, &sb) < 0 || S_ISDIR (sb.st_mode) == 0)
-       goto done;
-    }
-  else
-    goto done;
-
-  _vec_len (p) -= 1;
-  p = format (p, "/hugepages/hugepages-%ukB/free_hugepages%c", page_size, 0);
-  vlib_sysfs_read ((char *) p, "%d", &r);
-
-done:
-  vec_free (p);
-  return r;
-}
-
 clib_error_t *
 vlib_unix_recursive_mkdir (char *path)
 {