Author: rhs
Date: Mon May 28 17:05:52 2012
New Revision: 1343322
URL: http://svn.apache.org/viewvc?rev=1343322&view=rev
Log:
renamed dbuf -> data
Modified:
qpid/proton/trunk/proton-c/include/proton/codec.h
qpid/proton/trunk/proton-c/src/codec/codec.c
qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c
qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h
qpid/proton/trunk/proton-c/src/proton.c
Modified: qpid/proton/trunk/proton-c/include/proton/codec.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/codec.h?rev=1343322&r1=1343321&r2=1343322&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/codec.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/codec.h Mon May 28 17:05:52 2012
@@ -141,20 +141,20 @@ int pn_buffer_trim(pn_buffer_t *buf, siz
int pn_buffer_clear(pn_buffer_t *buf);
int pn_buffer_print(pn_buffer_t *buf);
-// dbuf
+// data
-typedef struct pn_dbuf_t pn_dbuf_t;
+typedef struct pn_data_t pn_data_t;
-pn_dbuf_t *pn_dbuf(size_t capacity);
-void pn_dbuf_free(pn_dbuf_t *data);
-int pn_dbuf_clear(pn_dbuf_t *data);
-int pn_dbuf_decode(pn_dbuf_t *data, char *bytes, size_t *size);
-int pn_dbuf_encode(pn_dbuf_t *data, char *bytes, size_t *size);
-int pn_dbuf_vfill(pn_dbuf_t *data, const char *fmt, va_list ap);
-int pn_dbuf_fill(pn_dbuf_t *data, const char *fmt, ...);
-int pn_dbuf_vscan(pn_dbuf_t *data, const char *fmt, va_list ap);
-int pn_dbuf_scan(pn_dbuf_t *data, const char *fmt, ...);
-int pn_dbuf_print(pn_dbuf_t *data);
-int pn_dbuf_format(pn_dbuf_t *data, char *bytes, size_t *size);
+pn_data_t *pn_data(size_t capacity);
+void pn_data_free(pn_data_t *data);
+int pn_data_clear(pn_data_t *data);
+int pn_data_decode(pn_data_t *data, char *bytes, size_t *size);
+int pn_data_encode(pn_data_t *data, char *bytes, size_t *size);
+int pn_data_vfill(pn_data_t *data, const char *fmt, va_list ap);
+int pn_data_fill(pn_data_t *data, const char *fmt, ...);
+int pn_data_vscan(pn_data_t *data, const char *fmt, va_list ap);
+int pn_data_scan(pn_data_t *data, const char *fmt, ...);
+int pn_data_print(pn_data_t *data);
+int pn_data_format(pn_data_t *data, char *bytes, size_t *size);
#endif /* codec.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=1343322&r1=1343321&r2=1343322&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/codec/codec.c (original)
+++ qpid/proton/trunk/proton-c/src/codec/codec.c Mon May 28 17:05:52 2012
@@ -1136,15 +1136,15 @@ int pn_fill_one(pn_atoms_t *atoms, const
int pn_vfill_atoms(pn_atoms_t *atoms, const char *fmt, va_list ap)
{
const char *pos = fmt;
- pn_atoms_t dbuf = *atoms;
+ pn_atoms_t copy = *atoms;
int count = 0;
while (*pos) {
- int err = pn_vfill_one(&dbuf, &pos, ap, false, &count);
+ int err = pn_vfill_one(©, &pos, ap, false, &count);
if (err) return err;
}
- atoms->size -= dbuf.size;
+ atoms->size -= copy.size;
return 0;
}
@@ -1579,12 +1579,12 @@ int pn_scan_atoms(const pn_atoms_t *atom
int pn_vscan_atoms(const pn_atoms_t *atoms, const char *fmt, va_list ap)
{
- pn_atoms_t dbuf = *atoms;
+ pn_atoms_t copy = *atoms;
const char *pos = fmt;
bool scanned;
while (*pos) {
- int err = pn_scan_one(&dbuf, &pos, ap, &scanned);
+ int err = pn_scan_one(©, &pos, ap, &scanned);
if (err) return err;
}
@@ -2425,9 +2425,9 @@ int pn_buffer_print(pn_buffer_t *buf)
return 0;
}
-// dbuf
+// data
-struct pn_dbuf_t {
+struct pn_data_t {
size_t capacity;
size_t size;
pn_atom_t *atoms;
@@ -2436,9 +2436,9 @@ struct pn_dbuf_t {
};
-pn_dbuf_t *pn_dbuf(size_t capacity)
+pn_data_t *pn_data(size_t capacity)
{
- pn_dbuf_t *data = malloc(sizeof(pn_dbuf_t));
+ pn_data_t *data = malloc(sizeof(pn_data_t));
data->capacity = capacity;
data->size = 0;
data->atoms = capacity ? malloc(capacity * sizeof(pn_atom_t)) : NULL;
@@ -2447,7 +2447,7 @@ pn_dbuf_t *pn_dbuf(size_t capacity)
return data;
}
-void pn_dbuf_free(pn_dbuf_t *data)
+void pn_data_free(pn_data_t *data)
{
if (data) {
pn_buffer_free(data->buf);
@@ -2456,7 +2456,7 @@ void pn_dbuf_free(pn_dbuf_t *data)
}
}
-int pn_dbuf_clear(pn_dbuf_t *data)
+int pn_data_clear(pn_data_t *data)
{
data->size = 0;
if (data->buf) {
@@ -2466,14 +2466,14 @@ int pn_dbuf_clear(pn_dbuf_t *data)
return 0;
}
-int pn_dbuf_grow(pn_dbuf_t *data)
+int pn_data_grow(pn_data_t *data)
{
data->capacity = 2*(data->capacity ? data->capacity : 16);
data->atoms = realloc(data->atoms, data->capacity * sizeof(pn_atom_t));
return 0;
}
-int pn_dbuf_decode(pn_dbuf_t *data, char *bytes, size_t *size)
+int pn_data_decode(pn_data_t *data, char *bytes, size_t *size)
{
pn_atoms_t atoms;
pn_bytes_t lbytes;
@@ -2491,7 +2491,7 @@ int pn_dbuf_decode(pn_dbuf_t *data, char
*size = lbytes.size;
return 0;
} else if (err == PN_OVERFLOW) {
- err = pn_dbuf_grow(data);
+ err = pn_data_grow(data);
if (err) return err;
atoms.size = data->capacity;
} else {
@@ -2500,7 +2500,7 @@ int pn_dbuf_decode(pn_dbuf_t *data, char
}
}
-int pn_dbuf_encode(pn_dbuf_t *data, char *bytes, size_t *size)
+int pn_data_encode(pn_data_t *data, char *bytes, size_t *size)
{
pn_atoms_t atoms = {.size=data->size, .start=data->atoms};
pn_bytes_t lbytes = pn_bytes(*size, bytes);
@@ -2512,7 +2512,7 @@ int pn_dbuf_encode(pn_dbuf_t *data, char
return 0;
}
-int pn_dbuf_vfill(pn_dbuf_t *data, const char *fmt, va_list ap)
+int pn_data_vfill(pn_data_t *data, const char *fmt, va_list ap)
{
pn_atoms_t atoms;
@@ -2524,7 +2524,7 @@ int pn_dbuf_vfill(pn_dbuf_t *data, const
data->size += atoms.size;
return 0;
} else if (err == PN_OVERFLOW) {
- err = pn_dbuf_grow(data);
+ err = pn_data_grow(data);
if (err) return err;
} else {
return err;
@@ -2532,44 +2532,44 @@ int pn_dbuf_vfill(pn_dbuf_t *data, const
}
}
-int pn_dbuf_fill(pn_dbuf_t *data, const char *fmt, ...)
+int pn_data_fill(pn_data_t *data, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- int err = pn_dbuf_vfill(data, fmt, ap);
+ int err = pn_data_vfill(data, fmt, ap);
va_end(ap);
return err;
}
-int pn_dbuf_vscan(pn_dbuf_t *data, const char *fmt, va_list ap)
+int pn_data_vscan(pn_data_t *data, const char *fmt, va_list ap)
{
pn_atoms_t atoms = {.size=data->size, .start=data->atoms};
return pn_vscan_atoms(&atoms, fmt, ap);
}
-int pn_dbuf_scan(pn_dbuf_t *data, const char *fmt, ...)
+int pn_data_scan(pn_data_t *data, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- int err = pn_dbuf_vscan(data, fmt, ap);
+ int err = pn_data_vscan(data, fmt, ap);
va_end(ap);
return err;
}
-int pn_dbuf_print(pn_dbuf_t *data)
+int pn_data_print(pn_data_t *data)
{
pn_atoms_t atoms = {.size=data->size, .start=data->atoms};
return pn_print_atoms(&atoms);
}
-pn_atoms_t pn_dbuf_atoms(pn_dbuf_t *data, size_t size)
+pn_atoms_t pn_data_atoms(pn_data_t *data, size_t size)
{
return (pn_atoms_t) {.size=size, .start=data->atoms};
}
-int pn_dbuf_format(pn_dbuf_t *data, char *bytes, size_t *size)
+int pn_data_format(pn_data_t *data, char *bytes, size_t *size)
{
- ssize_t sz = pn_format_atoms(bytes, *size, pn_dbuf_atoms(data, data->size));
+ ssize_t sz = pn_format_atoms(bytes, *size, pn_data_atoms(data, data->size));
if (sz < 0) {
return sz;
} else {
Modified: qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c?rev=1343322&r1=1343321&r2=1343322&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c (original)
+++ qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c Mon May 28 17:05:52
2012
@@ -37,11 +37,11 @@ pn_dispatcher_t *pn_dispatcher(uint8_t f
disp->channel = 0;
disp->code = 0;
- disp->args = pn_dbuf(16);
+ disp->args = pn_data(16);
disp->payload = NULL;
disp->size = 0;
- disp->output_args = pn_dbuf(16);
+ disp->output_args = pn_data(16);
// XXX
disp->capacity = 4*1024;
disp->output = malloc(disp->capacity);
@@ -56,8 +56,8 @@ pn_dispatcher_t *pn_dispatcher(uint8_t f
void pn_dispatcher_destroy(pn_dispatcher_t *disp)
{
if (disp) {
- pn_dbuf_free(disp->args);
- pn_dbuf_free(disp->output_args);
+ pn_data_free(disp->args);
+ pn_data_free(disp->output_args);
free(disp->output);
free(disp);
}
@@ -73,15 +73,15 @@ void pn_dispatcher_action(pn_dispatcher_
typedef enum {IN, OUT} pn_dir_t;
static void pn_do_trace(pn_dispatcher_t *disp, uint16_t ch, pn_dir_t dir,
- pn_dbuf_t *args, const char *payload, size_t size)
+ pn_data_t *args, const char *payload, size_t size)
{
if (disp->trace & PN_TRACE_FRM) {
uint64_t code64;
bool scanned;
- pn_dbuf_scan(args, "D?L.", &scanned, &code64);
+ pn_data_scan(args, "D?L.", &scanned, &code64);
uint8_t code = scanned ? code64 : 0;
size_t n = SCRATCH;
- pn_dbuf_format(args, disp->scratch, &n);
+ pn_data_format(args, disp->scratch, &n);
fprintf(stderr, "[%u] %s %s %s", ch, dir == OUT ? "->" : "<-",
disp->names[code], disp->scratch);
if (size) {
@@ -103,7 +103,7 @@ ssize_t pn_dispatcher_input(pn_dispatche
size_t n = pn_read_frame(&frame, bytes + read, available);
if (n) {
size_t dsize = frame.size;
- int e = pn_dbuf_decode(disp->args, frame.payload, &dsize);
+ int e = pn_data_decode(disp->args, frame.payload, &dsize);
if (e) {
fprintf(stderr, "Error decoding frame: %s\n", pn_error(e));
pn_fprint_data(stderr, frame.payload, frame.size);
@@ -115,7 +115,7 @@ ssize_t pn_dispatcher_input(pn_dispatche
// XXX: assuming numeric
uint64_t lcode;
bool scanned;
- e = pn_dbuf_scan(disp->args, "D?L.", &scanned, &lcode);
+ e = pn_data_scan(disp->args, "D?L.", &scanned, &lcode);
if (e) return e;
if (!scanned) {
fprintf(stderr, "Error dispatching frame\n");
@@ -134,7 +134,7 @@ ssize_t pn_dispatcher_input(pn_dispatche
disp->channel = 0;
disp->code = 0;
- pn_dbuf_clear(disp->args);
+ pn_data_clear(disp->args);
disp->size = 0;
disp->payload = NULL;
@@ -156,7 +156,7 @@ int pn_scan_args(pn_dispatcher_t *disp,
{
va_list ap;
va_start(ap, fmt);
- int err = pn_dbuf_vscan(disp->args, fmt, ap);
+ int err = pn_data_vscan(disp->args, fmt, ap);
va_end(ap);
return err;
}
@@ -171,8 +171,8 @@ int pn_post_frame(pn_dispatcher_t *disp,
{
va_list ap;
va_start(ap, fmt);
- pn_dbuf_clear(disp->output_args);
- int err = pn_dbuf_vfill(disp->output_args, fmt, ap);
+ pn_data_clear(disp->output_args);
+ int err = pn_data_vfill(disp->output_args, fmt, ap);
va_end(ap);
if (err) {
fprintf(stderr, "error posting frame: %s, %s\n", fmt, pn_error(err));
@@ -186,7 +186,7 @@ int pn_post_frame(pn_dispatcher_t *disp,
while (true) {
char buf[size];
size_t wr = size;
- err = pn_dbuf_encode(disp->output_args, buf, &wr);
+ err = pn_data_encode(disp->output_args, buf, &wr);
if (err)
{
if (err == PN_OVERFLOW) {
Modified: qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h?rev=1343322&r1=1343321&r2=1343322&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h (original)
+++ qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h Mon May 28 17:05:52
2012
@@ -40,10 +40,10 @@ struct pn_dispatcher_t {
pn_trace_t trace;
uint16_t channel;
uint8_t code;
- pn_dbuf_t *args;
+ pn_data_t *args;
char *payload;
size_t size;
- pn_dbuf_t *output_args;
+ pn_data_t *output_args;
const char *output_payload;
size_t output_size;
size_t capacity;
Modified: qpid/proton/trunk/proton-c/src/proton.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/proton.c?rev=1343322&r1=1343321&r2=1343322&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/proton.c (original)
+++ qpid/proton/trunk/proton-c/src/proton.c Mon May 28 17:05:52 2012
@@ -54,28 +54,28 @@ int buffer(int argc, char **argv)
pn_buffer_print(buf); printf("\n");
pn_buffer_free(buf);
- pn_dbuf_t *data = pn_dbuf(16);
- int err = pn_dbuf_fill(data, "Ds[iSi]", "desc", 1, "two", 3);
+ pn_data_t *data = pn_data(16);
+ int err = pn_data_fill(data, "Ds[iSi]", "desc", 1, "two", 3);
if (err) {
printf("%s\n", pn_error(err));
}
- pn_dbuf_print(data); printf("\n");
+ pn_data_print(data); printf("\n");
pn_bytes_t str;
- err = pn_dbuf_scan(data, "D.[.S.]", &str);
+ err = pn_data_scan(data, "D.[.S.]", &str);
if (err) {
printf("%s\n", pn_error(err));
} else {
printf("%.*s\n", (int) str.size, str.start);
}
- pn_dbuf_free(data);
+ pn_data_free(data);
return 0;
}
int value(int argc, char **argv)
{
- pn_atom_t dbuf[1024];
- pn_atoms_t atoms = {1024, dbuf};
+ pn_atom_t data[1024];
+ pn_atoms_t atoms = {1024, data};
int err = pn_fill_atoms(&atoms, "DDsL[i[i]i]{sfsf}@DLT[sss]", "blam", 21, 1,
2, 3,
"pi", 3.14159265359, "e", 2.7,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
