vppinfra: make _vec_len() read-only

[vpp.git] / src / vppinfra / unix-misc.c

diff --git a/src/vppinfra/unix-misc.c b/src/vppinfra/unix-misc.c
index 361015b..e73d01a 100644 (file)
--- a/src/vppinfra/unix-misc.c
+++ b/src/vppinfra/unix-misc.c
@@ -45,10 +45,11 @@
 #include <fcntl.h>
 #include <stdio.h>             /* for sprintf */
 
-__thread uword __os_thread_index = 0;
+__clib_export __thread uword __os_thread_index = 0;
+__clib_export __thread uword __os_numa_index = 0;
 
 clib_error_t *
-unix_file_n_bytes (char *file, uword * result)
+clib_file_n_bytes (char *file, uword * result)
 {
   struct stat s;
 
@@ -64,7 +65,7 @@ unix_file_n_bytes (char *file, uword * result)
 }
 
 clib_error_t *
-unix_file_read_contents (char *file, u8 * result, uword n_bytes)
+clib_file_read_contents (char *file, u8 * result, uword n_bytes)
 {
   int fd = -1;
   uword n_done, n_left;
@@ -107,20 +108,20 @@ done:
   return error;
 }
 
-clib_error_t *
-unix_file_contents (char *file, u8 ** result)
+__clib_export clib_error_t *
+clib_file_contents (char *file, u8 ** result)
 {
   uword n_bytes;
   clib_error_t *error = 0;
   u8 *v;
 
-  if ((error = unix_file_n_bytes (file, &n_bytes)))
+  if ((error = clib_file_n_bytes (file, &n_bytes)))
     return error;
 
   v = 0;
   vec_resize (v, n_bytes);
 
-  error = unix_file_read_contents (file, v, n_bytes);
+  error = clib_file_read_contents (file, v, n_bytes);
 
   if (error)
     vec_free (v);
@@ -157,7 +158,7 @@ unix_proc_file_contents (char *file, u8 ** result)
 
       if (bytes == 0)
        {
-         _vec_len (rv) = pos;
+         vec_set_len (rv, pos);
          break;
        }
       pos += bytes;
@@ -170,7 +171,7 @@ unix_proc_file_contents (char *file, u8 ** result)
 
 void os_panic (void) __attribute__ ((weak));
 
-void
+__clib_export void
 os_panic (void)
 {
   abort ();
@@ -214,15 +215,13 @@ os_puts (u8 * string, uword string_length, uword is_error)
     ;
 }
 
-void os_out_of_memory (void) __attribute__ ((weak));
-void
+__clib_export __clib_weak void
 os_out_of_memory (void)
 {
   os_panic ();
 }
 
-uword os_get_nthreads (void) __attribute__ ((weak));
-uword
+__clib_export __clib_weak uword
 os_get_nthreads (void)
 {
   return 1;