diff options
Diffstat (limited to 'src/svm')
| -rw-r--r-- | src/svm/svm_fifo.c | 14 | ||||
| -rw-r--r-- | src/svm/svmdb.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/svm/svm_fifo.c b/src/svm/svm_fifo.c index 1723cb4fa95..8e3bb0a7c8c 100644 --- a/src/svm/svm_fifo.c +++ b/src/svm/svm_fifo.c @@ -1403,7 +1403,7 @@ svm_fifo_replay (u8 * s, svm_fifo_t * f, u8 no_read, u8 verbose) u8 *data = 0; svm_fifo_trace_elem_t *trace; u32 offset; - svm_fifo_t *dummy_fifo; + svm_fifo_t *placeholder_fifo; if (!f) return s; @@ -1416,7 +1416,7 @@ svm_fifo_replay (u8 * s, svm_fifo_t * f, u8 no_read, u8 verbose) trace_len = 0; #endif - dummy_fifo = svm_fifo_alloc (f->size); + placeholder_fifo = svm_fifo_alloc (f->size); svm_fifo_init (f, f->size); clib_memset (f->head_chunk->data, 0xFF, f->size); vec_validate (data, f->size); @@ -1431,26 +1431,26 @@ svm_fifo_replay (u8 * s, svm_fifo_t * f, u8 no_read, u8 verbose) if (verbose) s = format (s, "adding [%u, %u]:", trace[i].offset, (trace[i].offset + trace[i].len)); - svm_fifo_enqueue_with_offset (dummy_fifo, trace[i].offset, + svm_fifo_enqueue_with_offset (placeholder_fifo, trace[i].offset, trace[i].len, &data[offset]); } else if (trace[i].action == 2) { if (verbose) s = format (s, "adding [%u, %u]:", 0, trace[i].len); - svm_fifo_enqueue (dummy_fifo, trace[i].len, &data[offset]); + svm_fifo_enqueue (placeholder_fifo, trace[i].len, &data[offset]); } else if (!no_read) { if (verbose) s = format (s, "read: %u", trace[i].len); - svm_fifo_dequeue_drop (dummy_fifo, trace[i].len); + svm_fifo_dequeue_drop (placeholder_fifo, trace[i].len); } if (verbose) - s = format (s, "%U", format_svm_fifo, dummy_fifo, 1); + s = format (s, "%U", format_svm_fifo, placeholder_fifo, 1); } - s = format (s, "result: %U", format_svm_fifo, dummy_fifo, 1); + s = format (s, "result: %U", format_svm_fifo, placeholder_fifo, 1); return s; } diff --git a/src/svm/svmdb.c b/src/svm/svmdb.c index f2aea5a0d49..15922ad68f4 100644 --- a/src/svm/svmdb.c +++ b/src/svm/svmdb.c @@ -198,7 +198,7 @@ svmdb_local_add_del_notification (svmdb_client_t * client, void *oldheap; hash_pair_t *hp; svmdb_shm_hdr_t *shm; - u8 *dummy_value = 0; + u8 *placeholder_value = 0; svmdb_value_t *value; svmdb_notify_t *np; int i; @@ -216,7 +216,7 @@ svmdb_local_add_del_notification (svmdb_client_t * client, if (hp == 0) { local_set_variable_nolock (client, a->nspace, (u8 *) a->var, - dummy_value, a->elsize); + placeholder_value, a->elsize); /* might have moved */ h = shm->namespaces[a->nspace]; hp = hash_get_pair_mem (h, a->var); |