avoid c++11 nullptr and use 0 on null comparison (#236)

filipecosta90 · web-flow · commit 0325e00f5c3b · 2023-10-16T10:39:07.000+01:00
diff --git a/memtier_benchmark.cpp b/memtier_benchmark.cpp
@@ -884,7 +884,7 @@ static int config_parse_args(int argc, char *argv[], struct benchmark_config *cf
                 {
                     const char tls_delimiter = ',';
                     char* tls_token = strtok(optarg, &tls_delimiter);
-                    while (tls_token != nullptr) {
+                    while (tls_token != 0) {
                         if (!strcasecmp(tls_token, "tlsv1"))
                             cfg->tls_protocols |= REDIS_TLS_PROTO_TLSv1;
                         else if (!strcasecmp(tls_token, "tlsv1.1"))
@@ -904,7 +904,7 @@ static int config_parse_args(int argc, char *argv[], struct benchmark_config *cf
                             return -1;
                             break;
                         }
-                        tls_token = strtok(nullptr, &tls_delimiter);
+                        tls_token = strtok(0, &tls_delimiter);
                     }
                     break;
                 }

Original file line number	Diff line number	Diff line change
`@@ -884,7 +884,7 @@ static int config_parse_args(int argc, char argv[], struct benchmark_config cf`
`884`	`884`	`{`
`885`	`885`	`const char tls_delimiter = ',';`
`886`	`886`	`char* tls_token = strtok(optarg, &tls_delimiter);`
`887`		`- while (tls_token != nullptr) {`
	`887`	`+ while (tls_token != 0) {`
`888`	`888`	`if (!strcasecmp(tls_token, "tlsv1"))`
`889`	`889`	`cfg->tls_protocols \|= REDIS_TLS_PROTO_TLSv1;`
`890`	`890`	`else if (!strcasecmp(tls_token, "tlsv1.1"))`
`@@ -904,7 +904,7 @@ static int config_parse_args(int argc, char argv[], struct benchmark_config cf`
`904`	`904`	`return -1;`
`905`	`905`	`break;`
`906`	`906`	`}`
`907`		`- tls_token = strtok(nullptr, &tls_delimiter);`
	`907`	`+ tls_token = strtok(0, &tls_delimiter);`
`908`	`908`	`}`
`909`	`909`	`break;`
`910`	`910`	`}`