Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

refactor: NULL => nullptr

Browse source
This commit is contained in:
Steffen Vogel 2019-04-07 13:23:43 +02:00
parent 9af70527ae
commit 1192f68785
11 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/config_helper.cpp
View file

@ -137,7 +137,7 @@ int json_to_config(json_t *json, config_setting_t *parent)
json_array_foreach(json, i, json_value) {
type = json_to_config_type(json_typeof(json_value));
cfg = config_setting_add(parent, NULL, type);
cfg = config_setting_add(parent, nullptr, type);
ret = json_to_config(json_value, cfg);
if (ret)
return ret;
@ -179,7 +179,7 @@ void json_object_extend_key_value_token(json_t *obj, const char *key, const char
while (token) {
json_object_extend_key_value(obj, key, token);
token = strtok_r(NULL, delim, &lasts);
token = strtok_r(nullptr, delim, &lasts);
}
free(str);
@ -199,7 +199,7 @@ void json_object_extend_key_value(json_t *obj, const char *key, const char *valu
cpy = strdup(key);
key1 = strtok_r(cpy, ".", &lasts);
key2 = strtok_r(NULL, ".", &lasts);
key2 = strtok_r(nullptr, ".", &lasts);
while (key1 && key2) {
existing = json_object_get(subobj, key1);
@ -271,8 +271,8 @@ success:
json_t * json_load_cli(int argc, const char *argv[])
{
const char *opt;
const char *key = NULL;
const char *value = NULL;
const char *key = nullptr;
const char *value = nullptr;
const char *sep;
char *cpy, *lasts;
@ -284,8 +284,8 @@ json_t * json_load_cli(int argc, const char *argv[])
/* Long Option */
if (opt[0] == '-' && opt[1] == '-') {
/* Option without value? Abort. */
if (key != NULL)
return NULL;
if (key != nullptr)
return nullptr;
key = opt + 2;
@ -295,24 +295,24 @@ json_t * json_load_cli(int argc, const char *argv[])
cpy = strdup(key);
key = strtok_r(cpy, "=", &lasts);
value = strtok_r(NULL, "", &lasts);
value = strtok_r(nullptr, "", &lasts);
json_object_extend_key_value_token(json, key, value);
free(cpy);
key = NULL;
key = nullptr;
}
}
/* Value */
else {
/* Value without key. Abort. */
if (key == NULL)
return NULL;
if (key == nullptr)
return nullptr;
value = opt;
json_object_extend_key_value_token(json, key, value);
key = NULL;
key = nullptr;
}
}

4
lib/hooks/average.cpp
View file

@ -64,7 +64,7 @@ public:
virtual ~AverageHook()
{
vlist_destroy(&signal_names, NULL, true);
vlist_destroy(&signal_names, nullptr, true);
bitset_destroy(&mask);
}
@ -91,7 +91,7 @@ public:
throw RuntimeError("Invalid signal mask");
/* Add averaged signal */
avg_sig = signal_create("average", NULL, SIGNAL_TYPE_FLOAT);
avg_sig = signal_create("average", nullptr, SIGNAL_TYPE_FLOAT);
if (!avg_sig)
throw RuntimeError("Failed to create new signal");

8
lib/hooks/cast.cpp
View file

@ -103,9 +103,9 @@ public:
assert(state != STATE_STARTED);
const char *name = NULL;
const char *unit = NULL;
const char *type = NULL;
const char *name = nullptr;
const char *unit = nullptr;
const char *type = nullptr;
ret = json_unpack_ex(cfg, &err, 0, "{ s: o, s?: s, s?: s, s?: s }",
"signal", &json_signal,
@ -122,7 +122,7 @@ public:
break;
case JSON_INTEGER:
signal_name = NULL;
signal_name = nullptr;
signal_index = json_integer_value(json_signal);
break;

2
lib/hooks/dp.cpp
View file

@ -201,7 +201,7 @@ public:
break;
case JSON_INTEGER:
signal_name = NULL;
signal_name = nullptr;
signal_index = json_integer_value(json_signal);
break;

4
lib/hooks/drop.cpp
View file

@ -45,7 +45,7 @@ public:
{
assert(state == STATE_PREPARED || state == STATE_STOPPED);
prev = NULL;
prev = nullptr;
state = STATE_STARTED;
}
@ -90,7 +90,7 @@ public:
if (prev) {
sample_decref(prev);
prev = NULL;
prev = nullptr;
}
}
};

2
lib/hooks/limit_rate.cpp
View file

@ -41,7 +41,7 @@ void LimitRateHook::parse(json_t *cfg)
assert(state != STATE_STARTED);
double rate;
const char *m = NULL;
const char *m = nullptr;
ret = json_unpack_ex(cfg, &err, 0, "{ s: F, s?: s }",
"rate", &rate,

2
lib/hooks/print.cpp
View file

@ -95,7 +95,7 @@ public:
virtual void parse(json_t *cfg)
{
const char *f = NULL, *p = NULL, *u = NULL;
const char *f = nullptr, *p = nullptr, *u = nullptr;
int ret;
json_error_t err;

2
lib/hooks/restart.cpp
View file

@ -45,7 +45,7 @@ public:
{
assert(state == STATE_PREPARED);
prev = NULL;
prev = nullptr;
state = STATE_STARTED;
}

2
lib/hooks/scale.cpp
View file

@ -89,7 +89,7 @@ public:
break;
case JSON_INTEGER:
signal_name = NULL;
signal_name = nullptr;
signal_index = json_integer_value(json_signal);
break;

2
lib/hooks/shift_ts.cpp
View file

@ -51,7 +51,7 @@ public:
virtual void parse(json_t *cfg)
{
double o;
const char *m = NULL;
const char *m = nullptr;
int ret;
json_error_t err;

26
src/villas-relay.cpp
View file

@ -74,7 +74,7 @@ lws_protocols protocols[] = {
.per_session_data_size = sizeof(Connection),
.rx_buffer_size = 0
},
{ NULL /* terminator */ }
{ nullptr /* terminator */ }
};
/** List of libwebsockets extensions. */
@ -89,18 +89,18 @@ static const lws_extension extensions[] = {
lws_extension_callback_pm_deflate,
"deflate_frame"
},
{ NULL /* terminator */ }
{ nullptr /* terminator */ }
};
static const lws_http_mount mount = {
.mount_next = NULL, /* linked-list "next" */
.mount_next = nullptr, /* linked-list "next" */
.mountpoint = "/api/v1", /* mountpoint URL */
.origin = NULL, /* protocol */
.def = NULL,
.origin = nullptr, /* protocol */
.def = nullptr,
.protocol = "http-api",
.cgienv = NULL,
.extra_mimetypes = NULL,
.interpret = NULL,
.cgienv = nullptr,
.extra_mimetypes = nullptr,
.interpret = nullptr,
.cgi_timeout = 0,
.cache_max_age = 0,
.auth_mask = 0,
@ -109,7 +109,7 @@ static const lws_http_mount mount = {
.cache_intermediaries = 0,
.origin_protocol = LWSMPRO_CALLBACK, /* dynamic */
.mountpoint_len = 7, /* char count */
.basic_auth_login_file =NULL,
.basic_auth_login_file =nullptr,
};
Session::Session(Identifier sid) :
@ -120,7 +120,7 @@ Session::Session(Identifier sid) :
sessions[sid] = this;
created = time(NULL);
created = time(nullptr);
uuid_generate(uuid);
}
@ -196,7 +196,7 @@ Connection::Connection(lws *w) :
lws_get_peer_addresses(wsi, lws_get_socket_fd(wsi), name, sizeof(name), ip, sizeof(ip));
created = time(NULL);
created = time(nullptr);
console->info("New connection established: session={}, remote={} ({})", session->identifier, name, ip);
}
@ -465,13 +465,13 @@ check: if (optarg == endptr) {
ctx_info.mounts = &mount;
context = lws_create_context(&ctx_info);
if (context == NULL) {
if (context == nullptr) {
console->error("WebSocket: failed to initialize server context");
exit(EXIT_FAILURE);
}
vhost = lws_create_vhost(context, &ctx_info);
if (vhost == NULL) {
if (vhost == nullptr) {
console->error("WebSocket: failed to initialize virtual host");
exit(EXIT_FAILURE);
}