diff options
| author | Přemysl Janouch <p.janouch@gmail.com> | 2011-02-02 19:30:06 +0100 |
|---|---|---|
| committer | Přemysl Janouch <p.janouch@gmail.com> | 2011-02-02 23:53:38 +0100 |
| commit | 75c2358b6967c0148087638364b64da66667f8a2 (patch) | |
| tree | 4a7119d8f07b74f9d4c3beef8a7ec82b5871135e /liblogdiag/ld-diagram-connection.c | |
| parent | f864693f1bac4617f1ae8e42cd847ccf5e57055f (diff) | |
| download | logdiag-75c2358b6967c0148087638364b64da66667f8a2.tar.gz logdiag-75c2358b6967c0148087638364b64da66667f8a2.tar.xz logdiag-75c2358b6967c0148087638364b64da66667f8a2.zip | |
Extend LdPointArray.
Diffstat (limited to 'liblogdiag/ld-diagram-connection.c')
| -rw-r--r-- | liblogdiag/ld-diagram-connection.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/liblogdiag/ld-diagram-connection.c b/liblogdiag/ld-diagram-connection.c index 04e5888..8eadbf6 100644 --- a/liblogdiag/ld-diagram-connection.c +++ b/liblogdiag/ld-diagram-connection.c @@ -168,22 +168,23 @@ ld_diagram_connection_get_points (LdDiagramConnection *self) storage = ld_diagram_object_get_storage (LD_DIAGRAM_OBJECT (self)); node = json_object_get_member (storage, "points"); if (!node || json_node_is_null (node)) - return ld_point_array_new (0); + return ld_point_array_new (); if (!JSON_NODE_HOLDS_ARRAY (node)) { WARN_NODE_TYPE (node, LD_TYPE_POINT_ARRAY); - return ld_point_array_new (0); + return ld_point_array_new (); } array = json_node_get_array (node); point_node_list = json_array_get_elements (array); - points = ld_point_array_new (json_array_get_length (array)); + points = ld_point_array_sized_new (json_array_get_length (array)); - points->num_points = 0; for (iter = point_node_list; iter; iter = g_list_next (iter)) { - if (read_point_node (iter->data, &points->points[points->num_points])) - points->num_points++; + g_assert (points->length < points->size); + + if (read_point_node (iter->data, &points->points[points->length])) + points->length++; } return points; } @@ -267,7 +268,7 @@ ld_diagram_connection_set_points (LdDiagramConnection *self, storage = ld_diagram_object_get_storage (LD_DIAGRAM_OBJECT (self)); array = json_array_new (); - for (i = 0; i < points->num_points; i++) + for (i = 0; i < points->length; i++) { point_array = json_array_new (); json_array_add_double_element (point_array, points->points[i].x); |