vpp-api: Add context to VPPStatsIOError.

[vpp.git] / src / vpp-api / client / stat_client.c

diff --git a/src/vpp-api/client/stat_client.c b/src/vpp-api/client/stat_client.c
index bd9d8cc..2cf53d5 100644 (file)
--- a/src/vpp-api/client/stat_client.c
+++ b/src/vpp-api/client/stat_client.c
@@ -124,14 +124,14 @@ stat_segment_connect_r (const char *socket_name, stat_client_main_t * sm)
       0)
     {
       close (sock);
-      return -1;
+      return -2;
     }
 
   if ((mfd = recv_fd (sock)) < 0)
     {
       close (sock);
       fprintf (stderr, "Receiving file descriptor failed\n");
-      return -1;
+      return -3;
     }
   close (sock);
 
@@ -142,13 +142,13 @@ stat_segment_connect_r (const char *socket_name, stat_client_main_t * sm)
   if (fstat (mfd, &st) == -1)
     {
       perror ("mmap fstat failed");
-      return -1;
+      return -4;
     }
   if ((memaddr =
        mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, mfd, 0)) == MAP_FAILED)
     {
       perror ("mmap map failed");
-      return -1;
+      return -5;
     }
 
   sm->memory_size = st.st_size;
@@ -321,7 +321,7 @@ stat_segment_ls_r (uint8_t ** patterns, stat_client_main_t * sm)
   int i, j;
   for (i = 0; i < vec_len (patterns); i++)
     {
-      int rv = regcomp (&regex[i], (char *) patterns[i], 0);
+      int rv = regcomp (&regex[i], (const char *) patterns[i], 0);
       if (rv)
        {
          fprintf (stderr, "Could not compile regex %s\n", patterns[i]);
@@ -419,12 +419,14 @@ stat_segment_vec_free (void *vec)
 }
 
 /* Create a vector from a string (or add to existing) */
-u8 **
-stat_segment_string_vector (u8 ** string_vector, char *string)
+uint8_t **
+stat_segment_string_vector (uint8_t ** string_vector, const char *string)
 {
-  u8 *name = 0;
-  name = vec_dup ((u8 *) string);
-  vec_add1 (string_vector, (u8 *) name);
+  uint8_t *name = 0;
+  size_t len = strlen (string);
+
+  vec_validate_init_c_string (name, string, len);
+  vec_add1 (string_vector, name);
   return string_vector;
 }