20 files changed, 37 insertions, 37 deletions
diff --git a/src/vppinfra/dlmalloc.c b/src/vppinfra/dlmalloc.c
index 16f2de0fc09..8a07621b7a5 100644
--- a/src/vppinfra/dlmalloc.c
+++ b/src/vppinfra/dlmalloc.c
@@ -342,7 +342,7 @@ static FORCEINLINE int win32munmap(void* ptr, size_t size) {
     #define CALL_MREMAP(addr, osz, nsz, mv)     MFAIL
 #endif /* HAVE_MMAP && HAVE_MREMAP */
 
-/* mstate bit set if continguous morecore disabled or failed */
+/* mstate bit set if contiguous morecore disabled or failed */
 #define USE_NONCONTIGUOUS_BIT (4U)
 
 /* mstate bit set if no expansion allowed */
@@ -1585,7 +1585,7 @@ static size_t traverse_and_check(mstate m);
   http://www.usenix.org/events/lisa03/tech/robertson.html The footer
   of an inuse chunk holds the xor of its mstate and a random seed,
   that is checked upon calls to free() and realloc().  This is
-  (probabalistically) unguessable from outside the program, but can be
+  (probabilistically) unguessable from outside the program, but can be
   computed by any code successfully malloc'ing any chunk, so does not
   itself provide protection against code that has already broken
   security through some other means.  Unlike Robertson et al, we
@@ -3278,7 +3278,7 @@ void* dlmalloc(size_t bytes) {
 
 void dlfree(void* mem) {
   /*
-     Consolidate freed chunks with preceeding or succeeding bordering
+     Consolidate freed chunks with preceding or succeeding bordering
      free chunks, if they exist, and then place in a bin.  Intermixed
      with special cases for top, dv, mmapped chunks, and usage errors.
   */
@@ -5048,10 +5048,10 @@ History:
         Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
       * Use last_remainder in more cases.
       * Pack bins using idea from  colin@nyx10.cs.du.edu
-      * Use ordered bins instead of best-fit threshhold
+      * Use ordered bins instead of best-fit threshold
       * Eliminate block-local decls to simplify tracing and debugging.
       * Support another case of realloc via move into top
-      * Fix error occuring when initial sbrk_base not word-aligned.
+      * Fix error occurring when initial sbrk_base not word-aligned.
       * Rely on page size for units instead of SBRK_UNIT to
         avoid surprises about sbrk alignment conventions.
       * Add mallinfo, mallopt. Thanks to Raymond Nijssen
diff --git a/src/vppinfra/elf.h b/src/vppinfra/elf.h
index 008ea284b31..c57b06f5d2a 100644
--- a/src/vppinfra/elf.h
+++ b/src/vppinfra/elf.h
@@ -120,7 +120,7 @@
   _ (68HC12, 53)		/* Motorola M68HC12 */			\
   _ (MMA, 54)			/* Fujitsu MMA Multimedia Accel. */	\
   _ (PCP, 55)			/* Siemens PCP */			\
-  _ (NCPU, 56)			/* Sony nCPU embeeded RISC */		\
+  _ (NCPU, 56)			/* Sony nCPU embedded RISC */		\
   _ (NDR1, 57)			/* Denso NDR1 microprocessor */		\
   _ (STARCORE, 58)		/* Motorola Start*Core processor */	\
   _ (ME16, 59)			/* Toyota ME16 processor */		\
diff --git a/src/vppinfra/elog.c b/src/vppinfra/elog.c
index 036dce98f32..a86fadeaa39 100644
--- a/src/vppinfra/elog.c
+++ b/src/vppinfra/elog.c
@@ -736,7 +736,7 @@ elog_merge (elog_main_t * dst, u8 * dst_tag, elog_main_t * src, u8 * src_tag,
 
     /*
      * Move the earlier set of events later, to avoid creating
-     * events which preceed the Big Bang (aka have negative timestamps).
+     * events which precede the Big Bang (aka have negative timestamps).
      *
      * Not to any scale, we have something like the following picture:
      *
diff --git a/src/vppinfra/hash.h b/src/vppinfra/hash.h
index de155e6ac1c..36a70066044 100644
--- a/src/vppinfra/hash.h
+++ b/src/vppinfra/hash.h
@@ -274,7 +274,7 @@ uword hash_bytes (void *v);
 /* Public macro to set (key, value) for pointer key */
 #define hash_set_mem(h,key,value) hash_set3 (h, pointer_to_uword (key), (value), 0)
 
-/* Public inline funcion allocate and copy key to use in hash for pointer key */
+/* Public inline function allocate and copy key to use in hash for pointer key */
 always_inline void
 hash_set_mem_alloc (uword ** h, void *key, uword v)
 {
@@ -290,7 +290,7 @@ hash_set_mem_alloc (uword ** h, void *key, uword v)
 /* Public macro to unset (key, value) for pointer key */
 #define hash_unset_mem(h,key)    ((h) = _hash_unset ((h), pointer_to_uword (key),0))
 
-/* Public inline funcion to unset pointer key and then free the key memory */
+/* Public inline function to unset pointer key and then free the key memory */
 always_inline void
 hash_unset_mem_free (uword ** h, void *key)
 {
@@ -311,7 +311,7 @@ extern void *_hash_free (void *v);
 
 clib_error_t *hash_validate (void *v);
 
-/* Public inline funcion to get the number of value bytes for a hash table */
+/* Public inline function to get the number of value bytes for a hash table */
 always_inline uword
 hash_value_bytes (hash_t * h)
 {
@@ -319,7 +319,7 @@ hash_value_bytes (hash_t * h)
   return (sizeof (p->value[0]) << h->log2_pair_size) - sizeof (p->key);
 }
 
-/* Public inline funcion to get log2(size of a (key,value) pair) */
+/* Public inline function to get log2(size of a (key,value) pair) */
 always_inline uword
 hash_pair_log2_bytes (hash_t * h)
 {
@@ -332,21 +332,21 @@ hash_pair_log2_bytes (hash_t * h)
   return log2_bytes;
 }
 
-/* Public inline funcion to get size of a (key,value) pair */
+/* Public inline function to get size of a (key,value) pair */
 always_inline uword
 hash_pair_bytes (hash_t * h)
 {
   return (uword) 1 << hash_pair_log2_bytes (h);
 }
 
-/* Public inline funcion to advance a pointer past one (key,value) pair */
+/* Public inline function to advance a pointer past one (key,value) pair */
 always_inline void *
 hash_forward1 (hash_t * h, void *v)
 {
   return (u8 *) v + hash_pair_bytes (h);
 }
 
-/* Public inline funcion to advance a pointer past N (key,value) pairs */
+/* Public inline function to advance a pointer past N (key,value) pairs */
 always_inline void *
 hash_forward (hash_t * h, void *v, uword n)
 {
@@ -438,7 +438,7 @@ do {                                                                        \
 
     calls body with each active hash pair
 */
-/* Iteratate over key/value pairs. */
+/* Iterate over key/value pairs. */
 #define hash_foreach(key_var,value_var,h,body)			\
 do {								\
   hash_pair_t * _r;						\
diff --git a/src/vppinfra/heap.h b/src/vppinfra/heap.h
index 70e34cb4eb3..f76c9453e65 100644
--- a/src/vppinfra/heap.h
+++ b/src/vppinfra/heap.h
@@ -137,7 +137,7 @@ typedef struct
 
   format_function_t *format_elt;
 
-  /* Used for validattion/debugging. */
+  /* Used for validation/debugging. */
   uword *used_elt_bitmap;
 
   /* First and last element of doubly linked chain of elements. */
@@ -150,7 +150,7 @@ typedef struct
 
   u32 flags;
   /* Static heaps are made from external memory given to
-     us by user and are not re-sizeable vectors. */
+     us by user and are not re-sizable vectors. */
 #define HEAP_IS_STATIC (1)
 } heap_header_t;
 
diff --git a/src/vppinfra/maplog.h b/src/vppinfra/maplog.h
index 67a83a72cf3..f7d2f75a95b 100644
--- a/src/vppinfra/maplog.h
+++ b/src/vppinfra/maplog.h
@@ -101,9 +101,9 @@ typedef struct
   u64 file_size_in_bytes;	/**< file size in bytes */
   u32 record_size_in_bytes;	/**< record size in bytes */
   u32 application_id;		/**< application identifier */
-  u8 application_major_version;	/**< applcation major version number */
-  u8 application_minor_version;	/**< applcation minor version number */
-  u8 application_patch_version;	/**< applcation patch version number */
+  u8 application_major_version;	/**< application major version number */
+  u8 application_minor_version;	/**< application minor version number */
+  u8 application_patch_version;	/**< application patch version number */
   u8 maplog_is_circular;	/**< single, circular log */
 } clib_maplog_init_args_t;
 
diff --git a/src/vppinfra/memcpy_avx2.h b/src/vppinfra/memcpy_avx2.h
index da398a4512a..6519d86924e 100644
--- a/src/vppinfra/memcpy_avx2.h
+++ b/src/vppinfra/memcpy_avx2.h
@@ -229,7 +229,7 @@ clib_memcpy (void *dst, const void *src, size_t n)
 }
 
 
-#endif /* included_clib_mamcpy_avx2_h */
+#endif /* included_clib_memcpy_avx2_h */
 
 
 /*
diff --git a/src/vppinfra/memcpy_avx512.h b/src/vppinfra/memcpy_avx512.h
index 003908026c3..67982500b6c 100644
--- a/src/vppinfra/memcpy_avx512.h
+++ b/src/vppinfra/memcpy_avx512.h
@@ -265,7 +265,7 @@ clib_memcpy (void *dst, const void *src, size_t n)
 }
 
 
-#endif /* included_clib_mamcpy_avx512_h */
+#endif /* included_clib_memcpy_avx512_h */
 
 
 /*
diff --git a/src/vppinfra/mhash.c b/src/vppinfra/mhash.c
index 00b67c4959f..b694cc7c50f 100644
--- a/src/vppinfra/mhash.c
+++ b/src/vppinfra/mhash.c
@@ -263,7 +263,7 @@ typedef struct
 {
   u32 heap_handle;
 
-  /* Must conincide with vec_header. */
+  /* Must coincide with vec_header. */
   vec_header_t vec;
 } mhash_string_key_t;
 
diff --git a/src/vppinfra/mheap.h b/src/vppinfra/mheap.h
index 918adb137d7..afc2bf485b5 100644
--- a/src/vppinfra/mheap.h
+++ b/src/vppinfra/mheap.h
@@ -80,7 +80,7 @@ uword mheap_bytes (void *v);
 
 void mheap_usage (void *v, clib_mem_usage_t * usage);
 
-/* Enable disable traceing. */
+/* Enable disable tracing. */
 void mheap_trace (void *v, int enable);
 
 /* Test routine. */
diff --git a/src/vppinfra/os.h b/src/vppinfra/os.h
index 33300716103..3ec214e29b1 100644
--- a/src/vppinfra/os.h
+++ b/src/vppinfra/os.h
@@ -44,7 +44,7 @@
 /* External panic function. */
 void os_panic (void);
 
-/* External exit function analagous to unix exit. */
+/* External exit function analogous to unix exit. */
 void os_exit (int code);
 
 /* External function to print a line. */
diff --git a/src/vppinfra/phash.c b/src/vppinfra/phash.c
index 14da522594a..f6eecaa4103 100644
--- a/src/vppinfra/phash.c
+++ b/src/vppinfra/phash.c
@@ -556,7 +556,7 @@ augment (phash_main_t * pm, u32 b_root, u32 high_water)
 
 	  /* tb_parent with v has either one or zero collisions. */
 
-	  /* add childb to the queue of reachable things */
+	  /* add child b to the queue of reachable things */
 	  if (tb_child)
 	    tb_child->water_b = high_water;
 	  pm->tabq[tail].b_q = tb_child ? tb_child - pm->tabb : ~0;
diff --git a/src/vppinfra/pool.h b/src/vppinfra/pool.h
index 2b8e0581e38..692702247ea 100644
--- a/src/vppinfra/pool.h
+++ b/src/vppinfra/pool.h
@@ -493,7 +493,7 @@ do {									\
     }
 
 /**
- * @brief Remove all elemenets from a pool in a safe way
+ * @brief Remove all elements from a pool in a safe way
  *
  * @param VAR each element in the pool
  * @param POOL The pool to flush
diff --git a/src/vppinfra/qsort.c b/src/vppinfra/qsort.c
index 2faa5897eb2..145ae40fe91 100644
--- a/src/vppinfra/qsort.c
+++ b/src/vppinfra/qsort.c
@@ -133,7 +133,7 @@ qsort (void *base, uword n, uword size,
  * of the first, last and middle elements).  (Using this median instead of
  * the first element is a big win). Then, the usual partitioning/swapping,
  * followed by moving the discriminator into the right place.  Then, figure
- * out the sizes of the two partions, do the smaller one recursively and the
+ * out the sizes of the two partitions, do the smaller one recursively and the
  * larger one via a repeat of this code.  Stopping when there are less than
  * THRESH elements in a partition and cleaning up with an insertion sort (in
  * our caller) is a huge win. All data swaps are done in-line, which is
diff --git a/src/vppinfra/test_vec.c b/src/vppinfra/test_vec.c
index d02d71c4a2a..bc878eef518 100644
--- a/src/vppinfra/test_vec.c
+++ b/src/vppinfra/test_vec.c
@@ -124,7 +124,7 @@ uword g_call_stats[OP_MAX];
 
 
 /* A structure for both vector headers and vector elements might be useful to
-   uncover potential alignement issues. */
+   uncover potential alignment issues. */
 
 typedef struct
 {
diff --git a/src/vppinfra/timing_wheel.h b/src/vppinfra/timing_wheel.h
index 7daea994248..e668eb031a2 100644
--- a/src/vppinfra/timing_wheel.h
+++ b/src/vppinfra/timing_wheel.h
@@ -20,7 +20,7 @@
 typedef struct
 {
   /* Time of this element in units cpu clock ticks relative to time
-     base. 32 bits should be large enough for serveral kilo-seconds
+     base. 32 bits should be large enough for several kilo-seconds
      to elapse before we have to re-set time base. */
   u32 cpu_time_relative_to_base;
 
diff --git a/src/vppinfra/unformat.c b/src/vppinfra/unformat.c
index e30c6d34c22..365cdb15700 100644
--- a/src/vppinfra/unformat.c
+++ b/src/vppinfra/unformat.c
@@ -167,7 +167,7 @@ di (unformat_input_t * i)
 #endif
 
 /* Parse delimited vector string.  If string starts with { then string
-   is delimited by balenced parenthesis.  Other string is delimited by
+   is delimited by balanced parenthesis.  Other string is delimited by
    white space.  {} were chosen since they are special to the shell. */
 static uword
 unformat_string (unformat_input_t * input,
diff --git a/src/vppinfra/valgrind.h b/src/vppinfra/valgrind.h
index e74d7e828be..7509e70eb72 100644
--- a/src/vppinfra/valgrind.h
+++ b/src/vppinfra/valgrind.h
@@ -3728,7 +3728,7 @@ VALGRIND_PRINTF_BACKTRACE (const char *format, ...)
 
 
 /* These requests allow control to move from the simulated CPU to the
-   real CPU, calling an arbitary function.
+   real CPU, calling an arbitrary function.
 
    Note that the current ThreadId is inserted as the first argument.
    So this call:
diff --git a/src/vppinfra/vec_bootstrap.h b/src/vppinfra/vec_bootstrap.h
index bff688965b4..fec0df08143 100644
--- a/src/vppinfra/vec_bootstrap.h
+++ b/src/vppinfra/vec_bootstrap.h
@@ -39,7 +39,7 @@
 #define included_clib_vec_bootstrap_h
 
 /** \file
-    Vector bootsrap header file
+    Vector bootstrap header file
 */
 
 /* Bootstrap include so that #include <vppinfra/mem.h> can include e.g.
@@ -47,7 +47,7 @@
 
 /** \brief vector header structure
 
-   Bookeeping header preceding vector elements in memory.
+   Bookkeeping header preceding vector elements in memory.
    User header information may preceed standard vec header.
    If you change u32 len -> u64 len, single vectors can
    exceed 2**32 elements. Clib heaps are vectors. */
diff --git a/src/vppinfra/warnings.h b/src/vppinfra/warnings.h
index 61dcc44f95a..1d9f4b7d749 100644
--- a/src/vppinfra/warnings.h
+++ b/src/vppinfra/warnings.h
@@ -33,12 +33,12 @@
 /*
  * Macros to toggle off/on warnings
  *
- * Start by silenging pragma warnings so that we can explicitely silence
+ * Start by silencing pragma warnings so that we can explicitly silence
  * a warning introduced on some compiler version and not get a warning on older
  * versions of that same compiler.
  *
- * gcc corresponding warnign is "Wpargma"
- * clang corresponding warnign is "Wunknown-warning-option"
+ * gcc corresponding warning is "Wpargma"
+ * clang corresponding warning is "Wunknown-warning-option"
  *
  * For example, Wtautological-compare is introduced in gcc-6 and this would
  * trigger a Wpargma warning on gcc-5.