Author: rhs
Date: Mon May 12 20:45:13 2014
New Revision: 1594084
URL: http://svn.apache.org/r1594084
Log:
use uint16_t instead of size_t to reference other nodes inside pn_data_t
Modified:
qpid/proton/trunk/proton-c/src/codec/codec.c
qpid/proton/trunk/proton-c/src/codec/data.h
Modified: qpid/proton/trunk/proton-c/src/codec/codec.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/codec/codec.c?rev=1594084&r1=1594083&r2=1594084&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/codec/codec.c (original)
+++ qpid/proton/trunk/proton-c/src/codec/codec.c Mon May 12 20:45:13 2014
@@ -1102,7 +1102,7 @@ int pn_data_resize(pn_data_t *data, size
}
-pni_node_t *pn_data_node(pn_data_t *data, size_t nd)
+pni_node_t *pn_data_node(pn_data_t *data, pni_nid_t nd)
{
if (nd) {
return &data->nodes[nd - 1];
@@ -1348,7 +1348,7 @@ bool pn_data_lookup(pn_data_t *data, con
void pn_data_dump(pn_data_t *data)
{
- printf("{current=%" PN_ZI ", parent=%" PN_ZI "}\n", data->current,
data->parent);
+ printf("{current=%" PN_ZI ", parent=%" PN_ZI "}\n", (size_t) data->current,
(size_t) data->parent);
for (unsigned i = 0; i < data->size; i++)
{
pni_node_t *node = &data->nodes[i];
@@ -1356,7 +1356,11 @@ void pn_data_dump(pn_data_t *data)
pni_inspect_atom((pn_atom_t *) &node->atom, data->str);
printf("Node %i: prev=%" PN_ZI ", next=%" PN_ZI ", parent=%" PN_ZI ",
down=%" PN_ZI
", children=%" PN_ZI ", type=%s (%s)\n",
- i + 1, node->prev, node->next, node->parent, node->down,
node->children,
+ i + 1, (size_t) node->prev,
+ (size_t) node->next,
+ (size_t) node->parent,
+ (size_t) node->down,
+ (size_t) node->children,
pn_type_name(node->atom.type), pn_string_get(data->str));
}
}
Modified: qpid/proton/trunk/proton-c/src/codec/data.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/codec/data.h?rev=1594084&r1=1594083&r2=1594084&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/codec/data.h (original)
+++ qpid/proton/trunk/proton-c/src/codec/data.h Mon May 12 20:45:13 2014
@@ -27,12 +27,14 @@
#include "decoder.h"
#include "encoder.h"
+typedef uint16_t pni_nid_t;
+
typedef struct {
- size_t next;
- size_t prev;
- size_t down;
- size_t parent;
- size_t children;
+ pni_nid_t next;
+ pni_nid_t prev;
+ pni_nid_t down;
+ pni_nid_t parent;
+ pni_nid_t children;
pn_atom_t atom;
// for arrays
bool described;
@@ -45,21 +47,21 @@ typedef struct {
} pni_node_t;
struct pn_data_t {
- size_t capacity;
- size_t size;
+ pni_nid_t capacity;
+ pni_nid_t size;
pni_node_t *nodes;
pn_buffer_t *buf;
- size_t parent;
- size_t current;
- size_t base_parent;
- size_t base_current;
+ pni_nid_t parent;
+ pni_nid_t current;
+ pni_nid_t base_parent;
+ pni_nid_t base_current;
pn_decoder_t *decoder;
pn_encoder_t *encoder;
pn_error_t *error;
pn_string_t *str;
};
-pni_node_t *pn_data_node(pn_data_t *data, size_t nd);
+pni_node_t *pn_data_node(pn_data_t *data, pni_nid_t nd);
int pni_data_traverse(pn_data_t *data,
int (*enter)(void *ctx, pn_data_t *data, pni_node_t
*node),
int (*exit)(void *ctx, pn_data_t *data, pni_node_t
*node),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
