Skip to content

Commit a5a43ae

Browse files
petrasovaapetrasovaa
authored
libparson: use the parser wrapper functions everywhere (#6403)
1 parent 3c7af12 commit a5a43ae

File tree

44 files changed

+989
-965
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+989
-965
lines changed

‎db/db.describe/local_proto.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef __LOCAL_PROTO_H__
22
#define __LOCAL_PROTO_H__
33

4-
#include <grass/parson.h>
4+
#include <grass/gjson.h>
55

66
enum OutputFormat { PLAIN, JSON };
77

‎db/db.describe/main.c‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <grass/gis.h>
2020
#include <grass/dbmi.h>
2121
#include <grass/glocale.h>
22-
#include <grass/parson.h>
22+
#include <grass/gjson.h>
2323
#include "local_proto.h"
2424

2525
struct {
@@ -49,16 +49,16 @@ int main(int argc, char **argv)
4949
parse_command_line(argc, argv);
5050

5151
if (parms.format == JSON) {
52-
root_value = json_value_init_object();
52+
root_value = G_json_value_init_object();
5353
if (root_value == NULL) {
5454
G_fatal_error(_("Failed to initialize JSON array. Out of memory?"));
5555
}
56-
root_object = json_object(root_value);
57-
cols_value = json_value_init_array();
56+
root_object = G_json_object(root_value);
57+
cols_value = G_json_value_init_array();
5858
if (cols_value == NULL) {
5959
G_fatal_error(_("Failed to initialize JSON array. Out of memory?"));
6060
}
61-
cols_array = json_array(cols_value);
61+
cols_array = G_json_array(cols_value);
6262
}
6363

6464
if (!db_table_exists(parms.driver, parms.database, parms.table)) {
@@ -100,8 +100,8 @@ int main(int argc, char **argv)
100100
fprintf(stdout, "nrows: %d\n", nrows);
101101
break;
102102
case JSON:
103-
json_object_set_number(root_object, "ncols", ncols);
104-
json_object_set_number(root_object, "nrows", nrows);
103+
G_json_object_set_number(root_object, "ncols", ncols);
104+
G_json_object_set_number(root_object, "nrows", nrows);
105105
break;
106106
}
107107

@@ -116,32 +116,32 @@ int main(int argc, char **argv)
116116
db_get_column_length(column));
117117
break;
118118
case JSON:
119-
col_value = json_value_init_object();
120-
col_object = json_object(col_value);
121-
json_object_set_number(col_object, "position", col + 1);
122-
json_object_set_string(col_object, "name",
123-
db_get_column_name(column));
124-
json_object_set_string(
119+
col_value = G_json_value_init_object();
120+
col_object = G_json_object(col_value);
121+
G_json_object_set_number(col_object, "position", col + 1);
122+
G_json_object_set_string(col_object, "name",
123+
db_get_column_name(column));
124+
G_json_object_set_string(
125125
col_object, "type",
126126
db_sqltype_name(db_get_column_sqltype(column)));
127-
json_object_set_number(col_object, "length",
128-
db_get_column_length(column));
129-
json_array_append_value(cols_array, col_value);
127+
G_json_object_set_number(col_object, "length",
128+
db_get_column_length(column));
129+
G_json_array_append_value(cols_array, col_value);
130130
break;
131131
}
132132
}
133133
}
134134

135135
if (parms.format == JSON) {
136-
json_object_set_value(root_object, "columns", cols_value);
136+
G_json_object_set_value(root_object, "columns", cols_value);
137137
char *serialized_string = NULL;
138-
serialized_string = json_serialize_to_string_pretty(root_value);
138+
serialized_string = G_json_serialize_to_string_pretty(root_value);
139139
if (serialized_string == NULL) {
140140
G_fatal_error(_("Failed to initialize pretty JSON string."));
141141
}
142142
puts(serialized_string);
143-
json_free_serialized_string(serialized_string);
144-
json_value_free(root_value);
143+
G_json_free_serialized_string(serialized_string);
144+
G_json_value_free(root_value);
145145
}
146146

147147
db_close_database(driver);

‎db/db.describe/printtab.c‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <grass/gis.h>
22
#include <grass/dbmi.h>
33
#include "local_proto.h"
4-
#include <grass/parson.h>
4+
#include <grass/gjson.h>
55

66
int print_table_definition(dbDriver *driver, dbTable *table,
77
enum OutputFormat format, JSON_Object *root_object,
@@ -18,9 +18,10 @@ int print_table_definition(dbDriver *driver, dbTable *table,
1818
fprintf(stdout, "description:%s\n", db_get_table_description(table));
1919
break;
2020
case JSON:
21-
json_object_set_string(root_object, "table", db_get_table_name(table));
22-
json_object_set_string(root_object, "description",
23-
db_get_table_description(table));
21+
G_json_object_set_string(root_object, "table",
22+
db_get_table_name(table));
23+
G_json_object_set_string(root_object, "description",
24+
db_get_table_description(table));
2425
break;
2526
}
2627

@@ -40,8 +41,8 @@ int print_table_definition(dbDriver *driver, dbTable *table,
4041
fprintf(stdout, "nrows:%d\n", nrows);
4142
break;
4243
case JSON:
43-
json_object_set_number(root_object, "ncols", ncols);
44-
json_object_set_number(root_object, "nrows", nrows);
44+
G_json_object_set_number(root_object, "ncols", ncols);
45+
G_json_object_set_number(root_object, "nrows", nrows);
4546
break;
4647
}
4748

@@ -82,38 +83,38 @@ int print_column_definition(dbColumn *column, int position,
8283
db_test_column_null_allowed(column) ? "yes" : "no");
8384
break;
8485
case JSON:
85-
col_value = json_value_init_object();
86-
col_object = json_object(col_value);
87-
json_object_set_number(col_object, "position", position);
88-
json_object_set_string(col_object, "column",
89-
db_get_column_name(column));
90-
json_object_set_string(col_object, "description",
91-
db_get_column_description(column));
92-
json_object_set_string(col_object, "type",
93-
db_sqltype_name(db_get_column_sqltype(column)));
94-
json_object_set_number(col_object, "length",
95-
db_get_column_length(column));
96-
json_object_set_number(col_object, "scale",
97-
db_get_column_scale(column));
98-
json_object_set_number(col_object, "precision",
99-
db_get_column_precision(column));
86+
col_value = G_json_value_init_object();
87+
col_object = G_json_object(col_value);
88+
G_json_object_set_number(col_object, "position", position);
89+
G_json_object_set_string(col_object, "column",
90+
db_get_column_name(column));
91+
G_json_object_set_string(col_object, "description",
92+
db_get_column_description(column));
93+
G_json_object_set_string(
94+
col_object, "type", db_sqltype_name(db_get_column_sqltype(column)));
95+
G_json_object_set_number(col_object, "length",
96+
db_get_column_length(column));
97+
G_json_object_set_number(col_object, "scale",
98+
db_get_column_scale(column));
99+
G_json_object_set_number(col_object, "precision",
100+
db_get_column_precision(column));
100101
if (db_test_column_has_default_value(column)) {
101102
db_init_string(&value_string);
102103
db_convert_column_default_value_to_string(column, &value_string);
103-
json_object_set_string(col_object, "default",
104-
db_get_string(&value_string));
104+
G_json_object_set_string(col_object, "default",
105+
db_get_string(&value_string));
105106
}
106107
else {
107-
json_object_set_null(col_object, "default");
108+
G_json_object_set_null(col_object, "default");
108109
}
109-
json_object_set_boolean(col_object, "nullok",
110-
db_test_column_null_allowed(column));
110+
G_json_object_set_boolean(col_object, "nullok",
111+
db_test_column_null_allowed(column));
111112
break;
112113
}
113114
print_priv("select", db_get_column_select_priv(column), format, col_object);
114115
print_priv("update", db_get_column_update_priv(column), format, col_object);
115116
if (format == JSON) {
116-
json_array_append_value(cols_array, col_value);
117+
G_json_array_append_value(cols_array, col_value);
117118
}
118119

119120
return 0;
@@ -141,13 +142,13 @@ int print_priv(char *label, int priv, enum OutputFormat format,
141142
case JSON:
142143
switch (priv) {
143144
case DB_GRANTED:
144-
json_object_set_boolean(root_object, label, 1);
145+
G_json_object_set_boolean(root_object, label, 1);
145146
break;
146147
case DB_NOT_GRANTED:
147-
json_object_set_boolean(root_object, label, 0);
148+
G_json_object_set_boolean(root_object, label, 0);
148149
break;
149150
default:
150-
json_object_set_null(root_object, label);
151+
G_json_object_set_null(root_object, label);
151152
break;
152153
}
153154
break;

‎general/g.mapset/main.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@
2323
#include <unistd.h>
2424
#include <grass/gis.h>
2525
#include <grass/glocale.h>
26-
#include <grass/parson.h>
26+
#include <grass/gjson.h>
2727
#include <grass/spawn.h>
2828

2929
enum OutputFormat { PLAIN, JSON };
3030

3131
// Function to serialize and print JSON value
3232
static void serialize_and_print_json_object(JSON_Value *root_value)
3333
{
34-
char *serialized_string = json_serialize_to_string_pretty(root_value);
34+
char *serialized_string = G_json_serialize_to_string_pretty(root_value);
3535
if (!serialized_string) {
36-
json_value_free(root_value);
36+
G_json_value_free(root_value);
3737
G_fatal_error(_("Failed to serialize JSON to pretty format."));
3838
}
3939

4040
puts(serialized_string);
41-
json_free_serialized_string(serialized_string);
42-
json_value_free(root_value);
41+
G_json_free_serialized_string(serialized_string);
42+
G_json_value_free(root_value);
4343
}
4444

4545
int main(int argc, char *argv[])
@@ -112,12 +112,12 @@ int main(int argc, char *argv[])
112112
if (strcmp(opt.format->answer, "json") == 0) {
113113
format = JSON;
114114

115-
root_value = json_value_init_object();
115+
root_value = G_json_value_init_object();
116116
if (root_value == NULL) {
117117
G_fatal_error(
118118
_("Failed to initialize JSON object. Out of memory?"));
119119
}
120-
root_object = json_object(root_value);
120+
root_object = G_json_object(root_value);
121121
}
122122
else {
123123
format = PLAIN;
@@ -135,8 +135,8 @@ int main(int argc, char *argv[])
135135
break;
136136

137137
case JSON:
138-
json_object_set_string(root_object, "project", location_old);
139-
json_object_set_string(root_object, "mapset", mapset_old);
138+
G_json_object_set_string(root_object, "project", location_old);
139+
G_json_object_set_string(root_object, "mapset", mapset_old);
140140
serialize_and_print_json_object(root_value);
141141
break;
142142
}
@@ -168,14 +168,14 @@ int main(int argc, char *argv[])
168168

169169
ms = G_get_available_mapsets();
170170
if (format == JSON) {
171-
mapsets_value = json_value_init_array();
171+
mapsets_value = G_json_value_init_array();
172172
if (mapsets_value == NULL) {
173173
G_fatal_error(
174174
_("Failed to initialize JSON array. Out of memory?"));
175175
}
176-
mapsets_array = json_array(mapsets_value);
176+
mapsets_array = G_json_array(mapsets_value);
177177

178-
json_object_set_string(root_object, "project", location_new);
178+
G_json_object_set_string(root_object, "project", location_new);
179179
}
180180

181181
for (nmapsets = 0; ms[nmapsets]; nmapsets++) {
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
186186
break;
187187

188188
case JSON:
189-
json_array_append_string(mapsets_array, ms[nmapsets]);
189+
G_json_array_append_string(mapsets_array, ms[nmapsets]);
190190
break;
191191
}
192192
}
@@ -197,7 +197,7 @@ int main(int argc, char *argv[])
197197
break;
198198

199199
case JSON:
200-
json_object_set_value(root_object, "mapsets", mapsets_value);
200+
G_json_object_set_value(root_object, "mapsets", mapsets_value);
201201
serialize_and_print_json_object(root_value);
202202
break;
203203
}

‎general/g.mapsets/list.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
#include <grass/gis.h>
44
#include <grass/glocale.h>
55
#include "local_proto.h"
6-
#include <grass/parson.h>
6+
#include <grass/gjson.h>
77

88
// Function to initialize a JSON object with a mapsets array
99
static JSON_Object *initialize_json_object(void)
1010
{
11-
JSON_Value *root_value = json_value_init_object();
11+
JSON_Value *root_value = G_json_value_init_object();
1212
if (!root_value) {
1313
G_fatal_error(_("Failed to initialize JSON object. Out of memory?"));
1414
}
1515

16-
JSON_Object *root_object = json_value_get_object(root_value);
17-
json_object_set_value(root_object, "mapsets", json_value_init_array());
16+
JSON_Object *root_object = G_json_value_get_object(root_value);
17+
G_json_object_set_value(root_object, "mapsets", G_json_value_init_array());
1818

19-
JSON_Array *mapsets = json_object_get_array(root_object, "mapsets");
19+
JSON_Array *mapsets = G_json_object_get_array(root_object, "mapsets");
2020
if (!mapsets) {
21-
json_value_free(root_value);
21+
G_json_value_free(root_value);
2222
G_fatal_error(_("Failed to initialize mapsets array. Out of memory?"));
2323
}
2424

@@ -28,15 +28,15 @@ static JSON_Object *initialize_json_object(void)
2828
// Function to serialize and print JSON object
2929
static void serialize_and_print_json_object(JSON_Value *root_value)
3030
{
31-
char *serialized_string = json_serialize_to_string_pretty(root_value);
31+
char *serialized_string = G_json_serialize_to_string_pretty(root_value);
3232
if (!serialized_string) {
33-
json_value_free(root_value);
33+
G_json_value_free(root_value);
3434
G_fatal_error(_("Failed to serialize JSON to pretty format."));
3535
}
3636

3737
fprintf(stdout, "%s\n", serialized_string);
38-
json_free_serialized_string(serialized_string);
39-
json_value_free(root_value);
38+
G_json_free_serialized_string(serialized_string);
39+
G_json_value_free(root_value);
4040
}
4141

4242
void list_available_mapsets(const char **mapset_name, int nmapsets,
@@ -74,26 +74,26 @@ void list_accessible_mapsets_json(void)
7474
{
7575
const char *name;
7676
JSON_Object *root_object = initialize_json_object();
77-
JSON_Array *mapsets = json_object_get_array(root_object, "mapsets");
77+
JSON_Array *mapsets = G_json_object_get_array(root_object, "mapsets");
7878

7979
for (int n = 0; (name = G_get_mapset_name(n)); n++) {
80-
json_array_append_string(mapsets, name);
80+
G_json_array_append_string(mapsets, name);
8181
}
8282

8383
serialize_and_print_json_object(
84-
json_object_get_wrapping_value(root_object));
84+
G_json_object_get_wrapping_value(root_object));
8585
}
8686

8787
// Lists available mapsets from a provided array in JSON format
8888
void list_avaliable_mapsets_json(const char **mapset_names, int nmapsets)
8989
{
9090
JSON_Object *root_object = initialize_json_object();
91-
JSON_Array *mapsets = json_object_get_array(root_object, "mapsets");
91+
JSON_Array *mapsets = G_json_object_get_array(root_object, "mapsets");
9292

9393
for (int n = 0; n < nmapsets; n++) {
94-
json_array_append_string(mapsets, mapset_names[n]);
94+
G_json_array_append_string(mapsets, mapset_names[n]);
9595
}
9696

9797
serialize_and_print_json_object(
98-
json_object_get_wrapping_value(root_object));
98+
G_json_object_get_wrapping_value(root_object));
9999
}

0 commit comments

Comments
 (0)