Commit 9733f2c5 authored by Pekka Pessi's avatar Pekka Pessi
Browse files

soa, su_home_get_stats(): 64-bit fixes with isize_t/issize_t.

darcs-hash:20060925222315-65a35-965ea9bd84865e00f67356e40a9f711134c07b23.gz
parent 565b7606
......@@ -370,10 +370,10 @@ void soa_base_deinit(soa_session_t *ss)
*
* @return Number of parameters set, or -1 upon an error.
*/
int soa_set_params(soa_session_t *ss, tag_type_t tag, tag_value_t value, ...)
issize_t soa_set_params(soa_session_t *ss, tag_type_t tag, tag_value_t value, ...)
{
ta_list ta;
int n;
isize_t n;
SU_DEBUG_9(("soa_set_params(%s::%p, ...) called\n",
ss ? ss->ss_actions->soa_name : "", ss));
......@@ -387,7 +387,7 @@ int soa_set_params(soa_session_t *ss, tag_type_t tag, tag_value_t value, ...)
ta_end(ta);
return n;
return (issize_t)n;
}
/**Base method for setting parameters.
......@@ -397,9 +397,9 @@ int soa_set_params(soa_session_t *ss, tag_type_t tag, tag_value_t value, ...)
*
* @return Number of parameters set, or -1 upon an error.
*/
int soa_base_set_params(soa_session_t *ss, tagi_t const *tags)
issize_t soa_base_set_params(soa_session_t *ss, tagi_t const *tags)
{
int n, change_session = 0;
isize_t n, change_session = 0;
sdp_session_t const *caps_sdp, *user_sdp;
char const *caps_sdp_str, *user_sdp_str;
......@@ -532,7 +532,7 @@ int soa_base_set_params(soa_session_t *ss, tagi_t const *tags)
if (change_session)
ss->ss_user_version++;
return n;
return (issize_t)n;
}
/** Get tagged parameters.
......@@ -570,7 +570,7 @@ issize_t soa_get_params(soa_session_t const *ss,
*
* @return Number of parameters get, or -1 upon an error.
*/
isize_t soa_base_get_params(soa_session_t const *ss, tagi_t *tags)
issize_t soa_base_get_params(soa_session_t const *ss, tagi_t *tags)
{
isize_t n;
......
......@@ -148,17 +148,15 @@ static void soa_static_deinit(soa_session_t *ss)
soa_base_deinit(ss);
}
static int soa_static_set_params(soa_session_t *ss, tagi_t const *tags)
static issize_t soa_static_set_params(soa_session_t *ss, tagi_t const *tags)
{
soa_static_session_t *sss = (soa_static_session_t *)ss;
char const *audio_aux = sss->sss_audio_aux;
int n, m;
issize_t n, m;
n = tl_gets(tags,
SOATAG_AUDIO_AUX_REF(audio_aux),
TAG_END());
if (n < 0)
return n;
if (str0casecmp(audio_aux, sss->sss_audio_aux)) {
char *s = su_strdup(ss->ss_home, audio_aux), *tbf = sss->sss_audio_aux;
......
......@@ -86,8 +86,8 @@ SOFIAPUBFUN void soa_session_unref(soa_session_t *ss);
SOFIAPUBFUN int soa_base_init(char const *name, soa_session_t *,
soa_session_t *parent);
SOFIAPUBFUN void soa_base_deinit(soa_session_t *ss);
SOFIAPUBFUN int soa_base_set_params(soa_session_t *ss, tagi_t const *tags);
SOFIAPUBFUN int soa_base_get_params(soa_session_t const *ss, tagi_t *tags);
SOFIAPUBFUN issize_t soa_base_set_params(soa_session_t *ss, tagi_t const *tags);
SOFIAPUBFUN issize_t soa_base_get_params(soa_session_t const *ss, tagi_t *tags);
SOFIAPUBFUN tagi_t *soa_base_get_paramlist(soa_session_t const *ss,
tag_type_t, tag_value_t, ...);
SOFIAPUBFUN char **soa_base_media_features(soa_session_t *,
......
......@@ -49,7 +49,7 @@ typedef struct su_home_stat_t su_home_stat_t;
SU_DLL void su_home_init_stats(su_home_t *h);
SU_DLL void su_home_get_stats(su_home_t *, int include_clones,
su_home_stat_t *stats, int statssize);
su_home_stat_t *stats, isize_t statssize);
SU_DLL void su_home_stat_add(su_home_stat_t *total,
su_home_stat_t const *hs);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment