Another take at fixing 64bit problems. PJ_MAX_OBJ_NAME is increased to 32 chars (from 16), and check all those sprintf's especially the ones with "%p" format.
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@635 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjsip-apps/src/samples/confbench.c b/pjsip-apps/src/samples/confbench.c
index 26a0fac..3ef6a96 100644
--- a/pjsip-apps/src/samples/confbench.c
+++ b/pjsip-apps/src/samples/confbench.c
@@ -141,7 +141,7 @@
static pj_status_t sine_get_frame( pjmedia_port *port,
pjmedia_frame *frame)
{
- port_data *sine = port->user_data;
+ port_data *sine = port->port_data.pdata;
pj_int16_t *samples = frame->buf;
unsigned i, count, left, right;
@@ -211,7 +211,7 @@
port->get_frame = &sine_get_frame;
/* Create sine port data */
- port->user_data = sine = pj_pool_zalloc(pool, sizeof(port_data));
+ port->port_data.pdata = sine = pj_pool_zalloc(pool, sizeof(port_data));
/* Create samples */
count = port->info.samples_per_frame / channel_count;
diff --git a/pjsip-apps/src/samples/playsine.c b/pjsip-apps/src/samples/playsine.c
index ae4bec8..4fad85b 100644
--- a/pjsip-apps/src/samples/playsine.c
+++ b/pjsip-apps/src/samples/playsine.c
@@ -80,7 +80,7 @@
static pj_status_t sine_get_frame( pjmedia_port *port,
pjmedia_frame *frame)
{
- port_data *sine = port->user_data;
+ port_data *sine = port->port_data.pdata;
pj_int16_t *samples = frame->buf;
unsigned i, count, left, right;
@@ -150,7 +150,7 @@
port->get_frame = &sine_get_frame;
/* Create sine port data */
- port->user_data = sine = pj_pool_zalloc(pool, sizeof(port_data));
+ port->port_data.pdata = sine = pj_pool_zalloc(pool, sizeof(port_data));
/* Create samples */
count = port->info.samples_per_frame / channel_count;