Project

General

Profile

Download (5.6 KB)

Feature #1396 ยป 0050-dataio_json.c-Replace-NULL-with-nullptr.patch

Marko Lindqvist, 05/17/2025 03:10 AM

View differences:

common/networking/dataio_json.c
**************************************************************************/
static CURL *get_curl(void)
{
static CURL *curl_easy_handle = NULL;
static CURL *curl_easy_handle = nullptr;
if (curl_easy_handle == NULL) {
if (curl_easy_handle == nullptr) {
curl_easy_handle = curl_easy_init();
} else {
/* Reuse the existing CURL easy handle */
......
{
int e = -1;
if (location->sub_location == NULL) {
if (location->sub_location == nullptr) {
e = json_object_set_new(item, location->name, data);
} else {
e = plocation_write_data(json_object_get(item, location->name),
......
{
int e = -1;
if (location->sub_location == NULL) {
if (location->sub_location == nullptr) {
if (location->number == -1) {
e = json_array_append_new(item, data);
} else {
......
static json_t *plocation_read_field(json_t *item,
const struct plocation *location)
{
if (location->sub_location == NULL) {
if (location->sub_location == nullptr) {
return json_object_get(item, location->name);
} else {
return plocation_read_data(json_object_get(item, location->name),
......
static json_t *plocation_read_elem(json_t *item,
const struct plocation *location)
{
if (location->sub_location == NULL) {
if (location->sub_location == nullptr) {
return json_array_get(item, location->number);
} else {
return plocation_read_data(json_array_get(item, location->number),
......
return plocation_read_elem(item, location);
default:
log_error("Unknown packet part location kind.");
return NULL;
return nullptr;
}
}
......
}
/**********************************************************************//**
Insert NULL-terminated string.
Insert nullptr-terminated string.
**************************************************************************/
int dio_put_string_json(struct json_data_out *dout,
const struct plocation *location,
......
if (dout->json) {
char *escaped_value;
/* Let CURL find the length it self by passing 0 */
/* Let CURL find the length itself by passing 0 */
escaped_value = curl_easy_escape(get_curl(), value, 0);
/* Handle as a regular string from now on. */
e = dio_put_string_json(dout, location, escaped_value);
/* CURL's memory management wants to free this it self. */
/* CURL's memory management wants to free this itself. */
curl_free(escaped_value);
} else {
e = dio_put_estring_raw(&dout->raw, value);
......
}
/**********************************************************************//**
Receive at max max_dest_size bytes long NULL-terminated string.
Receive at max max_dest_size bytes long nullptr-terminated string.
**************************************************************************/
static bool dio_get_string_json_internal(json_t *json_packet,
const struct plocation *location,
......
}
/**********************************************************************//**
Receive at max max_dest_size bytes long NULL-terminated string.
Receive at max max_dest_size bytes long nullptr-terminated string.
**************************************************************************/
bool dio_get_string_json(struct connection *pc, struct data_in *din,
const struct plocation *location,
......
return FALSE;
}
/* Let CURL find the length it self by passing 0 */
unescaped_value = curl_easy_unescape(get_curl(), escaped_value, 0, NULL);
/* Let CURL find the length itself by passing 0 */
unescaped_value = curl_easy_unescape(get_curl(), escaped_value,
0, nullptr);
/* Done with the escaped value. */
FC_FREE(escaped_value);
......
/* Don't copy the memory following unescaped_value. */
MIN(max_dest_size, strlen(unescaped_value) + 1));
/* CURL's memory management wants to free this it self. */
/* CURL's memory management wants to free this itself. */
curl_free(unescaped_value);
/* Make sure that the string is terminated. */
    (1-1/1)