Skip to content

Commit

Permalink
core: fix another dtrace compilation issue
Browse files Browse the repository at this point in the history
  • Loading branch information
dormando committed Mar 8, 2023
1 parent 5ed8b5e commit ad4b179
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion proto_bin.c
Expand Up @@ -390,7 +390,7 @@ static void complete_update_bin(conn *c) {
c->cas = cas;

#ifdef ENABLE_DTRACE
uint64_t cas = ITEM_get_cas(it);
cas = ITEM_get_cas(it);
switch (c->cmd) {
case NREAD_ADD:
MEMCACHED_COMMAND_ADD(c->sfd, ITEM_key(it), it->nkey,
Expand Down
2 changes: 1 addition & 1 deletion proto_text.c
Expand Up @@ -173,7 +173,7 @@ void complete_nread_ascii(conn *c) {
ret = store_item(it, comm, c->thread, &cas, c->set_stale);

#ifdef ENABLE_DTRACE
uint64_t cas = ITEM_get_cas(it);
cas = ITEM_get_cas(it);
switch (c->cmd) {
case NREAD_ADD:
MEMCACHED_COMMAND_ADD(c->sfd, ITEM_key(it), it->nkey,
Expand Down
8 changes: 4 additions & 4 deletions t/proxyconfig.t
Expand Up @@ -15,15 +15,15 @@ use MemcachedTest;
use IO::Select;
use IO::Socket qw(AF_INET SOCK_STREAM);

# TODO: possibly... set env var to a generated temp filename before starting
# the server so we can pass that in?
my $modefile = "/tmp/proxyconfigmode.lua";

if (!supports_proxy()) {
plan skip_all => 'proxy not enabled';
exit 0;
}

# TODO: possibly... set env var to a generated temp filename before starting
# the server so we can pass that in?
my $modefile = "/tmp/proxyconfigmode.lua";

# Set up some server sockets.
sub mock_server {
my $port = shift;
Expand Down

0 comments on commit ad4b179

Please sign in to comment.