Typos. A bunch of typos I've been collecting.

[vpp.git] / src / vnet / fib / fib_attached_export.c

diff --git a/src/vnet/fib/fib_attached_export.c b/src/vnet/fib/fib_attached_export.c
index 3b8c6b4..da83a3d 100644 (file)
--- a/src/vnet/fib/fib_attached_export.c
+++ b/src/vnet/fib/fib_attached_export.c
@@ -28,7 +28,7 @@
 typedef struct fib_ae_import_t_
 {
     /**
-     * The entry in the epxort table that this importer
+     * The entry in the export table that this importer
      * is importing covereds from
      */
     fib_node_index_t faei_export_entry;
@@ -86,7 +86,7 @@ typedef struct fib_ae_export_t_ {
 } fib_ae_export_t;
 
 /*
- * memory pools for the importers and exportes
+ * memory pools for the importers and exporters
  */
 static fib_ae_import_t *fib_ae_import_pool;
 static fib_ae_export_t *fib_ae_export_pool;
@@ -107,7 +107,7 @@ fib_entry_ae_add_or_lock (fib_node_index_t connected)
         fed = fib_entry_delegate_find_or_add(entry,
                                              FIB_ENTRY_DELEGATE_ATTACHED_EXPORT);
        pool_get(fib_ae_export_pool, export);
-       memset(export, 0, sizeof(*export));
+       clib_memset(export, 0, sizeof(*export));
 
        fed->fd_index = (export - fib_ae_export_pool);
        export->faee_ei = connected;
@@ -126,7 +126,6 @@ static void
 fib_entry_import_remove (fib_ae_import_t *import,
                         fib_node_index_t entry_index)
 {
-    fib_prefix_t prefix;
     u32 index;
 
     /*
@@ -137,12 +136,10 @@ fib_entry_import_remove (fib_ae_import_t *import,
     if (index < vec_len(import->faei_importeds))
     {
        /*
-        * this is an entry that was previsouly imported
+        * this is an entry that was previously imported
         */
-       fib_entry_get_prefix(entry_index, &prefix);
-
        fib_table_entry_special_remove(import->faei_import_fib,
-                                      &prefix,
+                                      fib_entry_get_prefix(entry_index),
                                       FIB_SOURCE_AE);
 
        fib_entry_unlock(entry_index);
@@ -155,7 +152,7 @@ fib_entry_import_add (fib_ae_import_t *import,
                      fib_node_index_t entry_index)
 {
     fib_node_index_t *existing;
-    fib_prefix_t prefix;
+    const fib_prefix_t *prefix;
 
     /*
      * ensure we only add the exported entry once, since
@@ -173,12 +170,12 @@ fib_entry_import_add (fib_ae_import_t *import,
      * this is the first time this export entry has been imported
      * Add it to the import FIB and to the list of importeds
      */
-    fib_entry_get_prefix(entry_index, &prefix);
+    prefix = fib_entry_get_prefix(entry_index);
 
     /*
      * don't import entries that have the same prefix the import entry
      */
-    if (0 != fib_prefix_cmp(&prefix,
+    if (0 != fib_prefix_cmp(prefix,
                            &import->faei_prefix))
     {
         const dpo_id_t *dpo;
@@ -188,7 +185,7 @@ fib_entry_import_add (fib_ae_import_t *import,
         if (dpo_id_is_valid(dpo) && !dpo_is_drop(dpo))
         {
             fib_table_entry_special_dpo_add(import->faei_import_fib,
-                                            &prefix,
+                                            prefix,
                                             FIB_SOURCE_AE,
                                             (fib_entry_get_flags(entry_index) |
                                              FIB_ENTRY_FLAG_EXCLUSIVE),
@@ -248,7 +245,7 @@ fib_attached_export_import (fib_entry_t *fib_entry,
     fib_node_index_t fei;
 
     /*
-     * save index for later post-realloc retreival
+     * save index for later post-realloc retrieval
      */
     fei = fib_entry_get_index(fib_entry);
 
@@ -313,7 +310,7 @@ fib_attached_export_import (fib_entry_t *fib_entry,
 }
 
 /**
- * \brief All the imported entries need to be pruged
+ * \brief All the imported entries need to be purged
  */
 void
 fib_attached_export_purge (fib_entry_t *fib_entry)
@@ -337,12 +334,8 @@ fib_attached_export_purge (fib_entry_t *fib_entry)
         */
        vec_foreach(import_index, import->faei_importeds)
        {
-           fib_prefix_t prefix;
-
-           fib_entry_get_prefix(*import_index, &prefix);
-
            fib_table_entry_delete(import->faei_import_fib,
-                                  &prefix,
+                                  fib_entry_get_prefix(*import_index),
                                   FIB_SOURCE_AE);
            fib_entry_unlock(*import_index);
        }