Skip to content

Commit e0a21c5

Browse files
Shivshankar-ReddyPatrickJS
Shivshankar-Reddy
authored and
PatrickJS
committed
Rename macros in valkey-cli.c and redis_strlcpy to valkey (valkey-io#284)
Signed-off-by: Shivshankar-Reddy <shiva.sheri.github@gmail.com>
1 parent 56df1e6 commit e0a21c5

10 files changed

Lines changed: 58 additions & 58 deletions

File tree

‎src/anet.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ int anetUnixGenericConnect(char *err, const char *path, int flags)
501501
return ANET_ERR;
502502

503503
sa.sun_family = AF_LOCAL;
504-
redis_strlcpy(sa.sun_path,path,sizeof(sa.sun_path));
504+
valkey_strlcpy(sa.sun_path,path,sizeof(sa.sun_path));
505505
if (flags & ANET_CONNECT_NONBLOCK) {
506506
if (anetNonBlock(err,s) != ANET_OK) {
507507
close(s);
@@ -613,7 +613,7 @@ int anetUnixServer(char *err, char *path, mode_t perm, int backlog)
613613

614614
memset(&sa,0,sizeof(sa));
615615
sa.sun_family = AF_LOCAL;
616-
redis_strlcpy(sa.sun_path,path,sizeof(sa.sun_path));
616+
valkey_strlcpy(sa.sun_path,path,sizeof(sa.sun_path));
617617
if (anetListen(err,s,(struct sockaddr*)&sa,sizeof(sa),backlog,perm) == ANET_ERR)
618618
return ANET_ERR;
619619
return s;

‎src/cluster_legacy.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ void clusterUpdateMyselfIp(void) {
883883
* duplicating the string. This way later we can check if
884884
* the address really changed. */
885885
prev_ip = zstrdup(prev_ip);
886-
redis_strlcpy(myself->ip,server.cluster_announce_ip,NET_IP_STR_LEN);
886+
valkey_strlcpy(myself->ip,server.cluster_announce_ip,NET_IP_STR_LEN);
887887
} else {
888888
myself->ip[0] = '\0'; /* Force autodetection. */
889889
}
@@ -3526,7 +3526,7 @@ static void clusterBuildMessageHdr(clusterMsg *hdr, int type, size_t msglen) {
35263526
* first byte is zero, they'll do auto discovery. */
35273527
memset(hdr->myip,0,NET_IP_STR_LEN);
35283528
if (server.cluster_announce_ip) {
3529-
redis_strlcpy(hdr->myip,server.cluster_announce_ip,NET_IP_STR_LEN);
3529+
valkey_strlcpy(hdr->myip,server.cluster_announce_ip,NET_IP_STR_LEN);
35303530
}
35313531

35323532
/* Handle cluster-announce-[tls-|bus-]port. */

‎src/config.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,7 @@ static int enumConfigSet(standardConfig *config, sds *argv, int argc, const char
19971997
}
19981998
sdsrange(enumerr,0,-3); /* Remove final ", ". */
19991999

2000-
redis_strlcpy(loadbuf, enumerr, LOADBUF_SIZE);
2000+
valkey_strlcpy(loadbuf, enumerr, LOADBUF_SIZE);
20012001

20022002
sdsfree(enumerr);
20032003
*err = loadbuf;

‎src/fmacros.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
* will error on stdlib definitions in files as well*/
6565
#if (__GNUC__ && __GNUC__ >= 4) && !defined __APPLE__
6666
int sprintf(char *str, const char *format, ...) __attribute__((deprecated("please avoid use of unsafe C functions. prefer use of snprintf instead")));
67-
char *strcpy(char *restrict dest, const char *src) __attribute__((deprecated("please avoid use of unsafe C functions. prefer use of redis_strlcpy instead")));
67+
char *strcpy(char *restrict dest, const char *src) __attribute__((deprecated("please avoid use of unsafe C functions. prefer use of valkey_strlcpy instead")));
6868
char *strcat(char *restrict dest, const char *restrict src) __attribute__((deprecated("please avoid use of unsafe C functions. prefer use of redis_strlcat instead")));
6969
#endif
7070

‎src/module.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9056,7 +9056,7 @@ int VM_GetClusterNodeInfo(ValkeyModuleCtx *ctx, const char *id, char *ip, char *
90569056
return VALKEYMODULE_ERR;
90579057
}
90589058

9059-
if (ip) redis_strlcpy(ip, clusterNodeIp(node),NET_IP_STR_LEN);
9059+
if (ip) valkey_strlcpy(ip, clusterNodeIp(node),NET_IP_STR_LEN);
90609060

90619061
if (master_id) {
90629062
/* If the information is not available, the function will set the
@@ -12627,7 +12627,7 @@ int moduleVerifyResourceName(const char *name) {
1262712627
static char configerr[CONFIG_ERR_SIZE];
1262812628
static void propagateErrorString(ValkeyModuleString *err_in, const char **err) {
1262912629
if (err_in) {
12630-
redis_strlcpy(configerr, err_in->ptr, CONFIG_ERR_SIZE);
12630+
valkey_strlcpy(configerr, err_in->ptr, CONFIG_ERR_SIZE);
1263112631
decrRefCount(err_in);
1263212632
*err = configerr;
1263312633
}

‎src/rdb.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,7 @@ void rdbRemoveTempFile(pid_t childpid, int from_signal) {
16141614

16151615
/* Generate temp rdb file name using async-signal safe functions. */
16161616
ll2string(pid, sizeof(pid), childpid);
1617-
redis_strlcpy(tmpfile, "temp-", sizeof(tmpfile));
1617+
valkey_strlcpy(tmpfile, "temp-", sizeof(tmpfile));
16181618
redis_strlcat(tmpfile, pid, sizeof(tmpfile));
16191619
redis_strlcat(tmpfile, ".rdb", sizeof(tmpfile));
16201620

‎src/strl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Returns strlen(src); if retval >= dsize, truncation occurred.
2222
*/
2323
size_t
24-
redis_strlcpy(char *dst, const char *src, size_t dsize)
24+
valkey_strlcpy(char *dst, const char *src, size_t dsize)
2525
{
2626
const char *osrc = src;
2727
size_t nleft = dsize;

‎src/util.c‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,53 +1385,53 @@ static void test_string2ll(void) {
13851385
long long v;
13861386

13871387
/* May not start with +. */
1388-
redis_strlcpy(buf,"+1",sizeof(buf));
1388+
valkey_strlcpy(buf,"+1",sizeof(buf));
13891389
assert(string2ll(buf,strlen(buf),&v) == 0);
13901390

13911391
/* Leading space. */
1392-
redis_strlcpy(buf," 1",sizeof(buf));
1392+
valkey_strlcpy(buf," 1",sizeof(buf));
13931393
assert(string2ll(buf,strlen(buf),&v) == 0);
13941394

13951395
/* Trailing space. */
1396-
redis_strlcpy(buf,"1 ",sizeof(buf));
1396+
valkey_strlcpy(buf,"1 ",sizeof(buf));
13971397
assert(string2ll(buf,strlen(buf),&v) == 0);
13981398

13991399
/* May not start with 0. */
1400-
redis_strlcpy(buf,"01",sizeof(buf));
1400+
valkey_strlcpy(buf,"01",sizeof(buf));
14011401
assert(string2ll(buf,strlen(buf),&v) == 0);
14021402

1403-
redis_strlcpy(buf,"-1",sizeof(buf));
1403+
valkey_strlcpy(buf,"-1",sizeof(buf));
14041404
assert(string2ll(buf,strlen(buf),&v) == 1);
14051405
assert(v == -1);
14061406

1407-
redis_strlcpy(buf,"0",sizeof(buf));
1407+
valkey_strlcpy(buf,"0",sizeof(buf));
14081408
assert(string2ll(buf,strlen(buf),&v) == 1);
14091409
assert(v == 0);
14101410

1411-
redis_strlcpy(buf,"1",sizeof(buf));
1411+
valkey_strlcpy(buf,"1",sizeof(buf));
14121412
assert(string2ll(buf,strlen(buf),&v) == 1);
14131413
assert(v == 1);
14141414

1415-
redis_strlcpy(buf,"99",sizeof(buf));
1415+
valkey_strlcpy(buf,"99",sizeof(buf));
14161416
assert(string2ll(buf,strlen(buf),&v) == 1);
14171417
assert(v == 99);
14181418

1419-
redis_strlcpy(buf,"-99",sizeof(buf));
1419+
valkey_strlcpy(buf,"-99",sizeof(buf));
14201420
assert(string2ll(buf,strlen(buf),&v) == 1);
14211421
assert(v == -99);
14221422

1423-
redis_strlcpy(buf,"-9223372036854775808",sizeof(buf));
1423+
valkey_strlcpy(buf,"-9223372036854775808",sizeof(buf));
14241424
assert(string2ll(buf,strlen(buf),&v) == 1);
14251425
assert(v == LLONG_MIN);
14261426

1427-
redis_strlcpy(buf,"-9223372036854775809",sizeof(buf)); /* overflow */
1427+
valkey_strlcpy(buf,"-9223372036854775809",sizeof(buf)); /* overflow */
14281428
assert(string2ll(buf,strlen(buf),&v) == 0);
14291429

1430-
redis_strlcpy(buf,"9223372036854775807",sizeof(buf));
1430+
valkey_strlcpy(buf,"9223372036854775807",sizeof(buf));
14311431
assert(string2ll(buf,strlen(buf),&v) == 1);
14321432
assert(v == LLONG_MAX);
14331433

1434-
redis_strlcpy(buf,"9223372036854775808",sizeof(buf)); /* overflow */
1434+
valkey_strlcpy(buf,"9223372036854775808",sizeof(buf)); /* overflow */
14351435
assert(string2ll(buf,strlen(buf),&v) == 0);
14361436
}
14371437

@@ -1440,46 +1440,46 @@ static void test_string2l(void) {
14401440
long v;
14411441

14421442
/* May not start with +. */
1443-
redis_strlcpy(buf,"+1",sizeof(buf));
1443+
valkey_strlcpy(buf,"+1",sizeof(buf));
14441444
assert(string2l(buf,strlen(buf),&v) == 0);
14451445

14461446
/* May not start with 0. */
1447-
redis_strlcpy(buf,"01",sizeof(buf));
1447+
valkey_strlcpy(buf,"01",sizeof(buf));
14481448
assert(string2l(buf,strlen(buf),&v) == 0);
14491449

1450-
redis_strlcpy(buf,"-1",sizeof(buf));
1450+
valkey_strlcpy(buf,"-1",sizeof(buf));
14511451
assert(string2l(buf,strlen(buf),&v) == 1);
14521452
assert(v == -1);
14531453

1454-
redis_strlcpy(buf,"0",sizeof(buf));
1454+
valkey_strlcpy(buf,"0",sizeof(buf));
14551455
assert(string2l(buf,strlen(buf),&v) == 1);
14561456
assert(v == 0);
14571457

1458-
redis_strlcpy(buf,"1",sizeof(buf));
1458+
valkey_strlcpy(buf,"1",sizeof(buf));
14591459
assert(string2l(buf,strlen(buf),&v) == 1);
14601460
assert(v == 1);
14611461

1462-
redis_strlcpy(buf,"99",sizeof(buf));
1462+
valkey_strlcpy(buf,"99",sizeof(buf));
14631463
assert(string2l(buf,strlen(buf),&v) == 1);
14641464
assert(v == 99);
14651465

1466-
redis_strlcpy(buf,"-99",sizeof(buf));
1466+
valkey_strlcpy(buf,"-99",sizeof(buf));
14671467
assert(string2l(buf,strlen(buf),&v) == 1);
14681468
assert(v == -99);
14691469

14701470
#if LONG_MAX != LLONG_MAX
1471-
redis_strlcpy(buf,"-2147483648",sizeof(buf));
1471+
valkey_strlcpy(buf,"-2147483648",sizeof(buf));
14721472
assert(string2l(buf,strlen(buf),&v) == 1);
14731473
assert(v == LONG_MIN);
14741474

1475-
redis_strlcpy(buf,"-2147483649",sizeof(buf)); /* overflow */
1475+
valkey_strlcpy(buf,"-2147483649",sizeof(buf)); /* overflow */
14761476
assert(string2l(buf,strlen(buf),&v) == 0);
14771477

1478-
redis_strlcpy(buf,"2147483647",sizeof(buf));
1478+
valkey_strlcpy(buf,"2147483647",sizeof(buf));
14791479
assert(string2l(buf,strlen(buf),&v) == 1);
14801480
assert(v == LONG_MAX);
14811481

1482-
redis_strlcpy(buf,"2147483648",sizeof(buf)); /* overflow */
1482+
valkey_strlcpy(buf,"2147483648",sizeof(buf)); /* overflow */
14831483
assert(string2l(buf,strlen(buf),&v) == 0);
14841484
#endif
14851485
}

‎src/util.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ int snprintf_async_signal_safe(char *to, size_t n, const char *fmt, ...)
9797
#else
9898
int snprintf_async_signal_safe(char *to, size_t n, const char *fmt, ...);
9999
#endif
100-
size_t redis_strlcpy(char *dst, const char *src, size_t dsize);
100+
size_t valkey_strlcpy(char *dst, const char *src, size_t dsize);
101101
size_t redis_strlcat(char *dst, const char *src, size_t dsize);
102102

103103
#ifdef SERVER_TEST

‎src/valkey-cli.c‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@
7272
#define OUTPUT_CSV 2
7373
#define OUTPUT_JSON 3
7474
#define OUTPUT_QUOTED_JSON 4
75-
#define REDIS_CLI_KEEPALIVE_INTERVAL 15 /* seconds */
76-
#define REDIS_CLI_DEFAULT_PIPE_TIMEOUT 30 /* seconds */
77-
#define REDIS_CLI_HISTFILE_ENV "REDISCLI_HISTFILE"
75+
#define CLI_KEEPALIVE_INTERVAL 15 /* seconds */
76+
#define CLI_DEFAULT_PIPE_TIMEOUT 30 /* seconds */
77+
#define CLI_HISTFILE_ENV "REDISCLI_HISTFILE"
7878
#define CLI_HISTFILE_DEFAULT ".valkeycli_history"
79-
#define REDIS_CLI_RCFILE_ENV "REDISCLI_RCFILE"
79+
#define CLI_RCFILE_ENV "REDISCLI_RCFILE"
8080
#define CLI_RCFILE_DEFAULT ".valkeyclirc"
81-
#define REDIS_CLI_AUTH_ENV "REDISCLI_AUTH"
82-
#define REDIS_CLI_CLUSTER_YES_ENV "REDISCLI_CLUSTER_YES"
81+
#define CLI_AUTH_ENV "REDISCLI_AUTH"
82+
#define CLI_CLUSTER_YES_ENV "REDISCLI_CLUSTER_YES"
8383

8484
#define CLUSTER_MANAGER_SLOTS 16384
8585
#define CLUSTER_MANAGER_PORT_INCR 10000 /* same as CLUSTER_PORT_INCR */
@@ -296,7 +296,7 @@ static long getLongInfoField(char *info, char *field);
296296
/*------------------------------------------------------------------------------
297297
* Utility functions
298298
*--------------------------------------------------------------------------- */
299-
size_t redis_strlcpy(char *dst, const char *src, size_t dsize);
299+
size_t valkey_strlcpy(char *dst, const char *src, size_t dsize);
300300

301301
static void cliPushHandler(void *, void *);
302302

@@ -1693,7 +1693,7 @@ static int cliConnect(int flags) {
16931693
* in order to prevent timeouts caused by the execution of long
16941694
* commands. At the same time this improves the detection of real
16951695
* errors. */
1696-
anetKeepAlive(NULL, context->fd, REDIS_CLI_KEEPALIVE_INTERVAL);
1696+
anetKeepAlive(NULL, context->fd, CLI_KEEPALIVE_INTERVAL);
16971697

16981698
/* State of the current connection. */
16991699
config.current_resp3 = 0;
@@ -2985,12 +2985,12 @@ static int parseOptions(int argc, char **argv) {
29852985

29862986
static void parseEnv(void) {
29872987
/* Set auth from env, but do not overwrite CLI arguments if passed */
2988-
char *auth = getenv(REDIS_CLI_AUTH_ENV);
2988+
char *auth = getenv(CLI_AUTH_ENV);
29892989
if (auth != NULL && config.conn_info.auth == NULL) {
29902990
config.conn_info.auth = auth;
29912991
}
29922992

2993-
char *cluster_yes = getenv(REDIS_CLI_CLUSTER_YES_ENV);
2993+
char *cluster_yes = getenv(CLI_CLUSTER_YES_ENV);
29942994
if (cluster_yes != NULL && !strcmp(cluster_yes, "1")) {
29952995
config.cluster_manager_command.flags |= CLUSTER_MANAGER_CMD_FLAG_YES;
29962996
}
@@ -3032,13 +3032,13 @@ static void usage(int err) {
30323032
" Default timeout is 0, meaning no limit, depending on the OS.\n"
30333033
" -s <socket> Server socket (overrides hostname and port).\n"
30343034
" -a <password> Password to use when connecting to the server.\n"
3035-
" You can also use the " REDIS_CLI_AUTH_ENV " environment\n"
3035+
" You can also use the " CLI_AUTH_ENV " environment\n"
30363036
" variable to pass this password more safely\n"
30373037
" (if both are used, this argument takes precedence).\n"
30383038
" --user <username> Used to send ACL style 'AUTH username pass'. Needs -a.\n"
30393039
" --pass <password> Alias of -a for consistency with the new --user option.\n"
30403040
" --askpass Force user to input password with mask from STDIN.\n"
3041-
" If this argument is used, '-a' and " REDIS_CLI_AUTH_ENV "\n"
3041+
" If this argument is used, '-a' and " CLI_AUTH_ENV "\n"
30423042
" environment variable will be ignored.\n"
30433043
" -u <uri> Server URI on format redis://user:password@host:port/dbnum\n"
30443044
" User, password and dbnum are optional. For authentication\n"
@@ -3095,7 +3095,7 @@ version,tls_usage);
30953095
" --pipe-timeout <n> In --pipe mode, abort with error if after sending all data.\n"
30963096
" no reply is received within <n> seconds.\n"
30973097
" Default timeout: %d. Use 0 to wait forever.\n",
3098-
REDIS_CLI_DEFAULT_PIPE_TIMEOUT);
3098+
CLI_DEFAULT_PIPE_TIMEOUT);
30993099
fprintf(target,
31003100
" --bigkeys Sample keys looking for keys with many elements (complexity).\n"
31013101
" --memkeys Sample keys looking for keys consuming a lot of memory.\n"
@@ -3258,7 +3258,7 @@ void cliSetPreferences(char **argv, int argc, int interactive) {
32583258

32593259
/* Load the ~/.valkeyclirc file if any. */
32603260
void cliLoadPreferences(void) {
3261-
sds rcfile = getDotfilePath(REDIS_CLI_RCFILE_ENV,CLI_RCFILE_DEFAULT);
3261+
sds rcfile = getDotfilePath(CLI_RCFILE_ENV,CLI_RCFILE_DEFAULT);
32623262
if (rcfile == NULL) return;
32633263
FILE *fp = fopen(rcfile,"r");
32643264
char buf[1024];
@@ -3379,7 +3379,7 @@ static void repl(void) {
33793379

33803380
/* Only use history and load the rc file when stdin is a tty. */
33813381
if (isatty(fileno(stdin))) {
3382-
historyfile = getDotfilePath(REDIS_CLI_HISTFILE_ENV,CLI_HISTFILE_DEFAULT);
3382+
historyfile = getDotfilePath(CLI_HISTFILE_ENV,CLI_HISTFILE_DEFAULT);
33833383
//keep in-memory history always regardless if history file can be determined
33843384
history = 1;
33853385
if (historyfile != NULL) {
@@ -4043,7 +4043,7 @@ static int clusterManagerCheckRedisReply(clusterManagerNode *n,
40434043
if (is_err) {
40444044
if (err != NULL) {
40454045
*err = zmalloc((r->len + 1) * sizeof(char));
4046-
redis_strlcpy(*err, r->str,(r->len + 1));
4046+
valkey_strlcpy(*err, r->str,(r->len + 1));
40474047
} else CLUSTER_MANAGER_PRINT_REPLY_ERROR(n, r->str);
40484048
}
40494049
return 0;
@@ -4113,7 +4113,7 @@ static int clusterManagerNodeConnect(clusterManagerNode *node) {
41134113
* in order to prevent timeouts caused by the execution of long
41144114
* commands. At the same time this improves the detection of real
41154115
* errors. */
4116-
anetKeepAlive(NULL, node->context->fd, REDIS_CLI_KEEPALIVE_INTERVAL);
4116+
anetKeepAlive(NULL, node->context->fd, CLI_KEEPALIVE_INTERVAL);
41174117
if (config.conn_info.auth) {
41184118
redisReply *reply;
41194119
if (config.conn_info.user == NULL)
@@ -4203,7 +4203,7 @@ static redisReply *clusterManagerGetNodeRedisInfo(clusterManagerNode *node,
42034203
if (info->type == REDIS_REPLY_ERROR) {
42044204
if (err != NULL) {
42054205
*err = zmalloc((info->len + 1) * sizeof(char));
4206-
redis_strlcpy(*err, info->str,(info->len + 1));
4206+
valkey_strlcpy(*err, info->str,(info->len + 1));
42074207
}
42084208
freeReplyObject(info);
42094209
return NULL;
@@ -4780,7 +4780,7 @@ static int clusterManagerSetSlot(clusterManagerNode *node1,
47804780
success = 0;
47814781
if (err != NULL) {
47824782
*err = zmalloc((reply->len + 1) * sizeof(char));
4783-
redis_strlcpy(*err, reply->str,(reply->len + 1));
4783+
valkey_strlcpy(*err, reply->str,(reply->len + 1));
47844784
} else CLUSTER_MANAGER_PRINT_REPLY_ERROR(node1, reply->str);
47854785
goto cleanup;
47864786
}
@@ -5054,7 +5054,7 @@ static int clusterManagerMigrateKeysInSlot(clusterManagerNode *source,
50545054
success = 0;
50555055
if (err != NULL) {
50565056
*err = zmalloc((reply->len + 1) * sizeof(char));
5057-
redis_strlcpy(*err, reply->str,(reply->len + 1));
5057+
valkey_strlcpy(*err, reply->str,(reply->len + 1));
50585058
CLUSTER_MANAGER_PRINT_REPLY_ERROR(source, *err);
50595059
}
50605060
goto next;
@@ -5166,7 +5166,7 @@ static int clusterManagerMigrateKeysInSlot(clusterManagerNode *source,
51665166
if (migrate_reply != NULL) {
51675167
if (err) {
51685168
*err = zmalloc((migrate_reply->len + 1) * sizeof(char));
5169-
redis_strlcpy(*err, migrate_reply->str, (migrate_reply->len + 1));
5169+
valkey_strlcpy(*err, migrate_reply->str, (migrate_reply->len + 1));
51705170
}
51715171
printf("\n");
51725172
CLUSTER_MANAGER_PRINT_REPLY_ERROR(source,
@@ -5283,7 +5283,7 @@ static int clusterManagerFlushNodeConfig(clusterManagerNode *node, char **err) {
52835283
if (reply == NULL || (is_err = (reply->type == REDIS_REPLY_ERROR))) {
52845284
if (is_err && err != NULL) {
52855285
*err = zmalloc((reply->len + 1) * sizeof(char));
5286-
redis_strlcpy(*err, reply->str, (reply->len + 1));
5286+
valkey_strlcpy(*err, reply->str, (reply->len + 1));
52875287
}
52885288
success = 0;
52895289
/* If the cluster did not already joined it is possible that
@@ -9881,7 +9881,7 @@ int main(int argc, char **argv) {
98819881
config.pattern = NULL;
98829882
config.rdb_filename = NULL;
98839883
config.pipe_mode = 0;
9884-
config.pipe_timeout = REDIS_CLI_DEFAULT_PIPE_TIMEOUT;
9884+
config.pipe_timeout = CLI_DEFAULT_PIPE_TIMEOUT;
98859885
config.bigkeys = 0;
98869886
config.memkeys = 0;
98879887
config.hotkeys = 0;

0 commit comments

Comments
 (0)