Source: kamailio
Severity: minor
Tags: patch
User: pkg-llvm-t...@lists.alioth.debian.org
Usertags: clang-ftbfs
Hello,
Using the rebuild infrastructure, your package fails to build with clang
(instead of gcc).
We detected this kinf of error:
http://clang.debian.net/status.php?version=3.4.2&key=NO_MEMBER
Full build log is available here:
http://clang.debian.net/logs/2014-06-16/kamailio_4.1.4-1_unstable_clang.log
Thanks,
Alexander
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--- ./modules/qos/qos_handlers.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/qos/qos_handlers.c 2014-07-24 02:15:30.101863273 +0400
@@ -293,7 +293,7 @@
LM_ERR("got NULL sdp_payload\n");
return;
}
- rpc->printf(c, "\t\t\t\tpayload[%d]=%.*s codec=%.*s",
+ rpc->printf_(c, "\t\t\t\tpayload[%d]=%.*s codec=%.*s",
i, sdp_payload->rtp_payload.len, sdp_payload->rtp_payload.s,
sdp_payload->rtp_enc.len, sdp_payload->rtp_enc.s);
sdp_payload = sdp_payload->next;
@@ -309,7 +309,7 @@
LM_ERR("got NULL stream\n");
return;
}
- rpc->printf(c, "\t\t\tmedia=%.*s IP:port=%.*s:%.*s trans=%.*s sendrecv=%.*s ptime=%.*s payload:%d",
+ rpc->printf_(c, "\t\t\tmedia=%.*s IP:port=%.*s:%.*s trans=%.*s sendrecv=%.*s ptime=%.*s payload:%d",
stream->media.len, stream->media.s,
stream->ip_addr.len, stream->ip_addr.s,
stream->port.len, stream->port.s,
@@ -326,7 +326,7 @@
int i;
sdp_session_cell_t *session;
- rpc->printf(c, "\t\tm_dir=%u m_id=%u method=%.*s cseq=%.*s negotiation=%u",
+ rpc->printf_(c, "\t\tm_dir=%u m_id=%u method=%.*s cseq=%.*s negotiation=%u",
qos_sdp->method_dir, qos_sdp->method_id,
qos_sdp->method.len, qos_sdp->method.s,
qos_sdp->cseq.len, qos_sdp->cseq.s, qos_sdp->negotiation);
@@ -334,7 +334,7 @@
for (i=1;i>=0;i--){
session = qos_sdp->sdp_session[i];
if (session) {
- rpc->printf(c, "\t\tcalle%s: cnt_disp=%.*s bw_type=%.*s bw_width=%.*s",
+ rpc->printf_(c, "\t\tcalle%s: cnt_disp=%.*s bw_type=%.*s bw_width=%.*s",
i?"e":"r",
session->cnt_disp.len, session->cnt_disp.s,
session->bw_type.len, session->bw_type.s,
@@ -355,13 +355,13 @@
qos_sdp = qos_ctx->pending_sdp;
if (qos_sdp) {
- rpc->printf(c, "\tqos:pending_sdp");
+ rpc->printf_(c, "\tqos:pending_sdp");
internal_rpc_print_qos(rpc, c, qos_sdp);
}
qos_sdp = qos_ctx->negotiated_sdp;
if (qos_sdp) {
- rpc->printf(c, "\tqos:negotiated_sdp");
+ rpc->printf_(c, "\tqos:negotiated_sdp");
internal_rpc_print_qos(rpc, c, qos_sdp);
}
--- ./modules/mi_rpc/mi_rpc_mod.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/mi_rpc/mi_rpc_mod.c 2014-07-24 02:15:30.033863404 +0400
@@ -268,7 +268,7 @@
case MI_FIFO_PRINT:
case MI_DATAGRAM_PRINT:
/* always success, code & reason are the part of the reply */
- rpc->printf(ctx, "%d %.*s\n", tree->code,
+ rpc->printf_(ctx, "%d %.*s\n", tree->code,
tree->reason.len, tree->reason.s);
break;
case MI_PRETTY_PRINT:
@@ -288,7 +288,7 @@
}
if (mode==MI_FIFO_PRINT){
/* mi fifo adds an extra "\n" at the end */
- rpc->printf(ctx, "\n");
+ rpc->printf_(ctx, "\n");
}
return 0;
--- ./modules/permissions/mi.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/permissions/mi.c 2014-07-24 02:15:30.093863289 +0400
@@ -63,7 +63,7 @@
return;
}
- rpc->printf(c, "Reload OK");
+ rpc->printf_(c, "Reload OK");
return;
}
@@ -130,7 +130,7 @@
return;
}
- rpc->printf(c, "Reload OK");
+ rpc->printf_(c, "Reload OK");
return;
}
@@ -325,9 +325,9 @@
uri[urip.len] = 0;
if (allow_test(basename, uri, contact) == 1) {
- rpc->printf(c, "Allowed");
+ rpc->printf_(c, "Allowed");
return;
}
- rpc->printf(c, "Denied");
+ rpc->printf_(c, "Denied");
return;
}
--- ./modules/xmlrpc/xmlrpc.c 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/xmlrpc/xmlrpc.c 2014-07-24 02:24:00.406100922 +0400
@@ -152,8 +152,8 @@
#if defined (__OS_darwin) || defined (__OS_freebsd)
/* redeclaration of functions from stdio.h throws errors */
#else
-int snprintf(char *str, size_t size, const char *format, ...);
-int vsnprintf(char *str, size_t size, const char *format, va_list ap);
+//int snprintf(char *str, size_t size, const char *format, ...);
+//int vsnprintf(char *str, size_t size, const char *format, va_list ap);
#endif
static int process_xmlrpc(sip_msg_t* msg);
@@ -2475,7 +2475,7 @@
func_param.fault = (rpc_fault_f)rpc_fault;
func_param.add = (rpc_add_f)rpc_add;
func_param.scan = (rpc_scan_f)rpc_scan;
- func_param.printf = (rpc_printf_f)rpc_printf;
+ func_param.printf_ = (rpc_printf_f)rpc_printf;
func_param.struct_add = (rpc_struct_add_f)rpc_struct_add;
func_param.struct_scan = (rpc_struct_scan_f)rpc_struct_scan;
func_param.struct_printf = (rpc_struct_printf_f)rpc_struct_printf;
--- ./modules/sca/sca_rpc.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/sca/sca_rpc.c 2014-07-24 02:15:29.933863591 +0400
@@ -115,7 +115,7 @@
&sub_uri );
}
if ( rc >= 0 ) {
- rc = rpc->printf( ctx, "%.*s %.*s%s%.*s %s %ld %.*s",
+ rc = rpc->printf_( ctx, "%.*s %.*s%s%.*s %s %ld %.*s",
STR_FMT( &aor_uri.user ),
STR_FMT( &sub_uri.host ),
(sub_uri.port.len ? ":" : "" ),
@@ -127,7 +127,7 @@
LM_ERR( "sca_rpc_show_all_subscriptions: parse_uri %.*s "
"failed, dumping unparsed info",
STR_FMT( &sub->target_aor ));
- rc = rpc->printf( ctx, "%.*s %.*s %s %ld %.*s",
+ rc = rpc->printf_( ctx, "%.*s %.*s %s %ld %.*s",
STR_FMT( &sub->target_aor ),
STR_FMT( &sub->subscriber ),
sca_event_name_from_type( sub->event ),
@@ -192,7 +192,7 @@
sca_hash_table_unlock_index( ht, i );
}
- rpc->printf( ctx, "%ld %.*s", sub_count, STR_FMT( &event_name ));
+ rpc->printf_( ctx, "%ld %.*s", sub_count, STR_FMT( &event_name ));
}
void
@@ -217,7 +217,7 @@
sub->expires = 0;
sub->dialog.notify_cseq += 1;
- rpc->printf( ctx, "Deactivating %s subscription from %.*s",
+ rpc->printf_( ctx, "Deactivating %s subscription from %.*s",
sca_event_name_from_type( sub->event ),
STR_FMT( &sub->subscriber ));
if ( rc < 0 ) {
@@ -308,7 +308,7 @@
}
}
- rc = rpc->printf( ctx, "%.*s %s %.*s %d",
+ rc = rpc->printf_( ctx, "%.*s %s %.*s %d",
STR_FMT( &sub->target_aor ),
sca_event_name_from_type( sub->event ),
STR_FMT( &sub->subscriber ),
@@ -358,7 +358,7 @@
app_list = (sca_appearance_list *)ent->value;
for ( app = app_list->appearances; app != NULL; app = app->next ) {
sca_appearance_state_to_str( app->state, &state_str );
- rc = rpc->printf( ctx, "%.*s %d %.*s %ld %.*s %.*s "
+ rc = rpc->printf_( ctx, "%.*s %d %.*s %ld %.*s %.*s "
"%.*s %.*s %.*s",
STR_FMT( &app_list->aor ),
app->index,
@@ -413,7 +413,7 @@
return;
}
- rpc->printf( ctx, "Seized %.*s appearance-index %d for %.*s",
+ rpc->printf_( ctx, "Seized %.*s appearance-index %d for %.*s",
STR_FMT( &aor ), app_idx, STR_FMT( &owner ));
if ( sca_notify_call_info_subscribers( sca, &aor ) < 0 ) {
--- ./modules/sipcapture/sipcapture.c 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/sipcapture/sipcapture.c 2014-07-24 02:15:30.009863449 +0400
@@ -2015,16 +2015,16 @@
if (strncasecmp(status.s, "on", strlen("on")) == 0) {
*capture_on_flag = 1;
- rpc->printf(c, "Enabled");
+ rpc->printf_(c, "Enabled");
return;
}
if (strncasecmp(status.s, "off", strlen("off")) == 0) {
*capture_on_flag = 0;
- rpc->printf(c, "Disabled");
+ rpc->printf_(c, "Disabled");
return;
}
if (strncasecmp(status.s, "check", strlen("check")) == 0) {
- rpc->printf(c, *capture_on_flag ? "Enabled" : "Disabled");
+ rpc->printf_(c, *capture_on_flag ? "Enabled" : "Disabled");
return;
}
rpc->fault(c, 500, "Bad parameter (on, off or check)");
--- ./modules/xhttp_rpc/xhttp_rpc.c 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/xhttp_rpc/xhttp_rpc.c 2014-07-24 02:15:30.021863426 +0400
@@ -645,7 +645,7 @@
func_param.fault = (rpc_fault_f)rpc_fault;
func_param.add = (rpc_add_f)rpc_add;
func_param.scan = (rpc_scan_f)rpc_scan;
- func_param.printf = (rpc_printf_f)rpc_printf;
+ func_param.printf_ = (rpc_printf_f)rpc_printf;
func_param.struct_add = (rpc_struct_add_f)rpc_struct_add;
func_param.struct_scan = (rpc_struct_scan_f)rpc_struct_scan;
func_param.struct_printf = (rpc_struct_printf_f)rpc_struct_printf;
--- ./modules/db_text/dbtext.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/db_text/dbtext.c 2014-07-24 02:15:29.989863487 +0400
@@ -142,9 +142,9 @@
/* rpc function implementations */
static void rpc_dump(rpc_t *rpc, void *c) {
if (0!=dbt_cache_print(0))
- rpc->printf(c, "Dump failed");
+ rpc->printf_(c, "Dump failed");
else
- rpc->printf(c, "Dump OK");
+ rpc->printf_(c, "Dump OK");
return;
}
--- ./modules/drouting/drouting.c 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/drouting/drouting.c 2014-07-24 02:15:29.921863613 +0400
@@ -469,17 +469,17 @@
if (db_hdl==NULL) {
db_hdl=dr_dbf.init(&db_url);
if(db_hdl==0 ) {
- rpc->printf(c, "cannot initialize database connection");
+ rpc->printf_(c, "cannot initialize database connection");
return;
}
}
if ( (n=dr_reload_data())!=0 ) {
- rpc->printf(c, "failed to load routing data");
+ rpc->printf_(c, "failed to load routing data");
return;
}
- rpc->printf(c, "relaad OK");
+ rpc->printf_(c, "relaad OK");
return;
}
--- ./modules/ratelimit/ratelimit.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/ratelimit/ratelimit.c 2014-07-24 02:15:29.925863605 +0400
@@ -1105,7 +1105,7 @@
LOCK_GET(rl_lock);
for (i=0; i<MAX_PIPES; i++) {
- if (rpc->printf(c, "PIPE[%d]: %d/%d (drop rate: %d)",
+ if (rpc->printf_(c, "PIPE[%d]: %d/%d (drop rate: %d)",
i, *pipes[i].last_counter, *pipes[i].limit,
*pipes[i].load) < 0) goto error;
}
@@ -1122,7 +1122,7 @@
if (*pipes[i].algo != PIPE_ALGO_NOP) {
if (str_map_int(algo_names, *pipes[i].algo, &algo))
goto error;
- if (rpc->printf(c, "PIPE[%d]: %d:%.*s %d/%d (drop rate: %d) [%d]",
+ if (rpc->printf_(c, "PIPE[%d]: %d:%.*s %d/%d (drop rate: %d) [%d]",
i, *pipes[i].algo, algo.len, algo.s,
*pipes[i].last_counter, *pipes[i].limit,
*pipes[i].load, *pipes[i].counter) < 0) goto error;
@@ -1172,7 +1172,7 @@
LOCK_GET(rl_lock);
for (i=0; i<MAX_QUEUES; i++) {
if (queues[i].pipe) {
- if (rpc->printf(c, "QUEUE[%d]: %d:%.*s",
+ if (rpc->printf_(c, "QUEUE[%d]: %d:%.*s",
i, *queues[i].pipe,
(*queues[i].method).len,
(*queues[i].method).s) < 0) goto error;
@@ -1218,7 +1218,7 @@
}
static void rpc_get_pid(rpc_t *rpc, void *c) {
- rpc->printf(c, "ki[%f] kp[%f] kd[%f] ", *pid_ki, *pid_kp, *pid_kd);
+ rpc->printf_(c, "ki[%f] kp[%f] kd[%f] ", *pid_ki, *pid_kp, *pid_kd);
}
static void rpc_set_pid(rpc_t *rpc, void *c) {
--- ./modules/prefix_route/pr_rpc.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/prefix_route/pr_rpc.c 2014-07-24 02:15:30.049863373 +0400
@@ -65,7 +65,7 @@
buf[strlen(buf)-1] = '\0';
- rpc->printf(c, "%s", buf);
+ rpc->printf_(c, "%s", buf);
}
fclose(f);
@@ -84,7 +84,7 @@
rpc->fault(c, 400, "failed to reload prefix routes");
}
else {
- rpc->printf(c, "Prefix routes reloaded successfully");
+ rpc->printf_(c, "Prefix routes reloaded successfully");
}
}
--- ./modules/ctl/fifo_server.c 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/ctl/fifo_server.c 2014-07-24 02:19:51.784255787 +0400
@@ -909,7 +909,7 @@
func_param.fault = (rpc_fault_f)rpc_fault;
func_param.add = (rpc_add_f)rpc_add;
func_param.scan = (rpc_scan_f)rpc_scan;
- func_param.printf = (rpc_printf_f)rpc_printf;
+ func_param.printf_ = (rpc_printf_f)rpc_printf;
func_param.struct_add = (rpc_struct_add_f)rpc_struct_add;
func_param.struct_scan = (rpc_struct_scan_f)rpc_struct_scan;
func_param.struct_printf = (rpc_struct_printf_f)rpc_struct_printf;
--- ./modules/presence/presence.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/presence/presence.c 2014-07-24 02:15:30.129863220 +0400
@@ -1806,7 +1806,7 @@
(void) msg_presentity_clean(0,0);
(void) timer_db_update(0,0);
- rpc->printf(c, "Reload OK");
+ rpc->printf_(c, "Reload OK");
return;
}
--- ./modules/cfg_rpc/cfg_rpc.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/cfg_rpc/cfg_rpc.c 2014-07-24 02:15:29.965863532 +0400
@@ -349,7 +349,7 @@
break;
case CFG_VAR_POINTER:
- rpc->printf(c, "%p", val);
+ rpc->printf_(c, "%p", val);
break;
}
@@ -380,12 +380,12 @@
switch (input_type) {
case CFG_INPUT_INT:
- rpc->printf(c, "(parameter type is integer)");
+ rpc->printf_(c, "(parameter type is integer)");
break;
case CFG_INPUT_STRING:
case CFG_INPUT_STR:
- rpc->printf(c, "(parameter type is string)");
+ rpc->printf_(c, "(parameter type is string)");
break;
}
}
@@ -415,7 +415,7 @@
&& (memcmp(gname.s, group.s, group.len) == 0))
)
for (i=0; def[i].name; i++)
- rpc->printf(c, "%.*s: %s", gname.len, gname.s, def[i].name);
+ rpc->printf_(c, "%.*s: %s", gname.len, gname.s, def[i].name);
}
static const char* rpc_diff_doc[2] = {
--- ./modules/xhttp_pi/xhttp_pi.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/xhttp_pi/xhttp_pi.c 2014-07-24 02:15:30.157863166 +0400
@@ -377,9 +377,9 @@
static void rpc_reload(rpc_t *rpc, void *c) {
lock_get(ph_lock);
if (0!=ph_init_cmds(&ph_framework_data, filename.s)) {
- rpc->printf(c, "Reload failed");
+ rpc->printf_(c, "Reload failed");
} else {
- rpc->printf(c, "Reload OK");
+ rpc->printf_(c, "Reload OK");
}
lock_release(ph_lock);
return;
--- ./modules/dialog/dialog.c 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/dialog/dialog.c 2014-07-24 02:15:29.913863628 +0400
@@ -1437,30 +1437,30 @@
{
rpc_cb_ctx_t rpc_cb;
- rpc->printf(c, "hash:%u:%u state:%u ref_count:%u timestart:%u timeout:%u",
+ rpc->printf_(c, "hash:%u:%u state:%u ref_count:%u timestart:%u timeout:%u",
dlg->h_entry, dlg->h_id, dlg->state, dlg->ref, dlg->start_ts, dlg->tl.timeout);
- rpc->printf(c, "\tcallid:%.*s from_tag:%.*s to_tag:%.*s",
+ rpc->printf_(c, "\tcallid:%.*s from_tag:%.*s to_tag:%.*s",
dlg->callid.len, dlg->callid.s,
dlg->tag[DLG_CALLER_LEG].len, dlg->tag[DLG_CALLER_LEG].s,
dlg->tag[DLG_CALLEE_LEG].len, dlg->tag[DLG_CALLEE_LEG].s);
- rpc->printf(c, "\tfrom_uri:%.*s to_uri:%.*s",
+ rpc->printf_(c, "\tfrom_uri:%.*s to_uri:%.*s",
dlg->from_uri.len, dlg->from_uri.s, dlg->to_uri.len, dlg->to_uri.s);
- rpc->printf(c, "\tcaller_contact:%.*s caller_cseq:%.*s",
+ rpc->printf_(c, "\tcaller_contact:%.*s caller_cseq:%.*s",
dlg->contact[DLG_CALLER_LEG].len, dlg->contact[DLG_CALLER_LEG].s,
dlg->cseq[DLG_CALLER_LEG].len, dlg->cseq[DLG_CALLER_LEG].s);
- rpc->printf(c, "\tcaller_route_set: %.*s",
+ rpc->printf_(c, "\tcaller_route_set: %.*s",
dlg->route_set[DLG_CALLER_LEG].len, dlg->route_set[DLG_CALLER_LEG].s);
- rpc->printf(c, "\tcallee_contact:%.*s callee_cseq:%.*s",
+ rpc->printf_(c, "\tcallee_contact:%.*s callee_cseq:%.*s",
dlg->contact[DLG_CALLEE_LEG].len, dlg->contact[DLG_CALLEE_LEG].s,
dlg->cseq[DLG_CALLEE_LEG].len, dlg->cseq[DLG_CALLEE_LEG].s);
- rpc->printf(c, "\tcallee_route_set: %.*s",
+ rpc->printf_(c, "\tcallee_route_set: %.*s",
dlg->route_set[DLG_CALLEE_LEG].len, dlg->route_set[DLG_CALLEE_LEG].s);
if (dlg->bind_addr[DLG_CALLEE_LEG]) {
- rpc->printf(c, "\tcaller_bind_addr:%.*s callee_bind_addr:%.*s",
+ rpc->printf_(c, "\tcaller_bind_addr:%.*s callee_bind_addr:%.*s",
dlg->bind_addr[DLG_CALLER_LEG]->sock_str.len, dlg->bind_addr[DLG_CALLER_LEG]->sock_str.s,
dlg->bind_addr[DLG_CALLEE_LEG]->sock_str.len, dlg->bind_addr[DLG_CALLEE_LEG]->sock_str.s);
} else {
- rpc->printf(c, "\tcaller_bind_addr:%.*s callee_bind_addr:",
+ rpc->printf_(c, "\tcaller_bind_addr:%.*s callee_bind_addr:",
dlg->bind_addr[DLG_CALLER_LEG]->sock_str.len, dlg->bind_addr[DLG_CALLER_LEG]->sock_str.s);
}
if (with_context) {
@@ -1534,19 +1534,19 @@
profile = search_dlg_profile( profile_name );
if (!profile) {
- rpc->printf(c, "Non existing profile:%.*s",
+ rpc->printf_(c, "Non existing profile:%.*s",
profile_name->len, profile_name->s);
return;
}
size = get_profile_size(profile, value);
if (value) {
- rpc->printf(c, "Profile:%.*s => profile:%.*s value:%.*s count:%u",
+ rpc->printf_(c, "Profile:%.*s => profile:%.*s value:%.*s count:%u",
profile_name->len, profile_name->s,
profile->name.len, profile->name.s,
value->len, value->s, size);
return;
} else {
- rpc->printf(c, "Profile:%.*s => profile:%.*s value: count:%u",
+ rpc->printf_(c, "Profile:%.*s => profile:%.*s value: count:%u",
profile_name->len, profile_name->s,
profile->name.len, profile->name.s, size);
return;
@@ -1572,7 +1572,7 @@
profile = search_dlg_profile( profile_name );
if (!profile) {
- rpc->printf(c, "Non existing profile:%.*s",
+ rpc->printf_(c, "Non existing profile:%.*s",
profile_name->len, profile_name->s);
return;
}
--- ./modules/pv/pv_shv.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/pv/pv_shv.c 2014-07-24 02:15:30.041863388 +0400
@@ -755,7 +755,7 @@
rpc->fault(c, 500, "Cannot set shared variable value");
LM_ERR("cannot set shv value\n");
} else {
- rpc->printf(c, "Ok. Variable set to new value.");
+ rpc->printf_(c, "Ok. Variable set to new value.");
}
unlock_shvar(shv);
--- ./modules/pipelimit/pipelimit.c 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/pipelimit/pipelimit.c 2014-07-24 02:15:29.949863561 +0400
@@ -745,7 +745,7 @@
void rpc_pl_get_pid(rpc_t *rpc, void *c) {
rpl_pipe_lock(0);
- rpc->printf(c, "ki[%f] kp[%f] kd[%f] ", *pid_ki, *pid_kp, *pid_kd);
+ rpc->printf_(c, "ki[%f] kp[%f] kd[%f] ", *pid_ki, *pid_kp, *pid_kd);
rpl_pipe_release(0);
}
--- ./modules/pipelimit/pl_ht.c 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/pipelimit/pl_ht.c 2014-07-24 02:15:30.145863189 +0400
@@ -604,7 +604,7 @@
while(it)
{
if (it->algo != PIPE_ALGO_NOP) {
- if (rpc->printf(c, "PIPE: id=%.*s load=%d counter=%d",
+ if (rpc->printf_(c, "PIPE: id=%.*s load=%d counter=%d",
it->name.len, it->name.s,
it->load, it->last_counter) < 0)
{
@@ -636,7 +636,7 @@
lock_release(&_pl_pipes_ht->slots[i].lock);
return;
}
- if (rpc->printf(c, "PIPE: id=%.*s algorithm=%.*s limit=%d counter=%d",
+ if (rpc->printf_(c, "PIPE: id=%.*s algorithm=%.*s limit=%d counter=%d",
it->name.len, it->name.s, algo.len, algo.s,
it->limit, it->counter) < 0)
{
--- ./modules/app_lua/app_lua_mod.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/app_lua/app_lua_mod.c 2014-07-24 02:15:30.137863205 +0400
@@ -388,13 +388,13 @@
i = 0;
while(li)
{
- rpc->printf(ctx, "%d: [%s]", i, li->script);
+ rpc->printf_(ctx, "%d: [%s]", i, li->script);
li = li->next;
i += 1;
}
}
else {
- rpc->printf(ctx,"No scripts loaded");
+ rpc->printf_(ctx,"No scripts loaded");
}
return;
}
--- ./modules/siptrace/siptrace.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./modules/siptrace/siptrace.c 2014-07-24 02:15:29.981863502 +0400
@@ -1779,16 +1779,16 @@
if (strncasecmp(status.s, "on", strlen("on")) == 0) {
*trace_on_flag = 1;
- rpc->printf(c, "Enabled");
+ rpc->printf_(c, "Enabled");
return;
}
if (strncasecmp(status.s, "off", strlen("off")) == 0) {
*trace_on_flag = 0;
- rpc->printf(c, "Disabled");
+ rpc->printf_(c, "Disabled");
return;
}
if (strncasecmp(status.s, "check", strlen("check")) == 0) {
- rpc->printf(c, *trace_on_flag ? "Enabled" : "Disabled");
+ rpc->printf_(c, *trace_on_flag ? "Enabled" : "Disabled");
return;
}
rpc->fault(c, 500, "Bad parameter (on, off or check)");
--- ./dst_blacklist.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./dst_blacklist.c 2014-07-24 02:18:55.704601817 +0400
@@ -1075,11 +1075,11 @@
continue;
}
dst_blst_entry2ip(&ip, e);
- rpc->printf(ctx, "{\n protocol: %s", get_proto_name(e->proto));
- rpc->printf(ctx, " ip: %s", ip_addr2a(&ip));
- rpc->printf(ctx, " port: %d", e->port);
- rpc->printf(ctx, " expires in (s): %d", expires);
- rpc->printf(ctx, " flags: %d\n}", e->flags);
+ rpc->printf_(ctx, "{\n protocol: %s", get_proto_name(e->proto));
+ rpc->printf_(ctx, " ip: %s", ip_addr2a(&ip));
+ rpc->printf_(ctx, " port: %d", e->port);
+ rpc->printf_(ctx, " expires in (s): %d", expires);
+ rpc->printf_(ctx, " flags: %d\n}", e->flags);
}
UNLOCK_BLST(h);
}
--- ./rpc.h 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./rpc.h 2014-07-24 02:15:32.677858228 +0400
@@ -72,7 +72,7 @@
rpc_send_f send;
rpc_add_f add;
rpc_scan_f scan;
- rpc_printf_f printf;
+ rpc_printf_f printf_;
rpc_struct_add_f struct_add;
rpc_struct_scan_f struct_scan;
rpc_struct_printf_f struct_printf;
--- ./obsolete/dispatcher/ds_rpc.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./obsolete/dispatcher/ds_rpc.c 2014-07-24 02:15:29.893863666 +0400
@@ -56,19 +56,19 @@
int set, node;
- if (rpc->printf(c,
+ if (rpc->printf_(c,
"flags: DS_MAX_SETS: %d DS_MAX_NODES: %d DS_MAX_URILEN: %d",
DS_MAX_SETS, DS_MAX_NODES, DS_MAX_URILEN) < 0) return;
- if (rpc->printf(c,
+ if (rpc->printf_(c,
"Active dispatcher list: %d", *ds_activelist) < 0) return;
if (*ds_activelist == 0) {
for (set = 0; set < DS_MAX_SETS; set++) {
if (ds_setlen_a[set] == 0) {
- if (rpc->printf(c, "Set %2d is empty", set) < 0) return;
+ if (rpc->printf_(c, "Set %2d is empty", set) < 0) return;
} else {
- if (rpc->printf(c, "Set %2d:", set) < 0) return;
+ if (rpc->printf_(c, "Set %2d:", set) < 0) return;
for (node = 0; node < (long int) ds_setlen_a[set]; node++) {
- if (rpc->printf(c, " node %3d %s",
+ if (rpc->printf_(c, " node %3d %s",
node, ds_setp_a[set][node]) < 0) return;
}
}
@@ -76,17 +76,17 @@
} else {
for (set = 0; set < DS_MAX_SETS; set++) {
if (ds_setlen_b[set] == 0) {
- if (rpc->printf(c, "Set %2d is empty", set) < 0) return;
+ if (rpc->printf_(c, "Set %2d is empty", set) < 0) return;
} else {
- if (rpc->printf(c, "Set %2d:", set) < 0) return;
+ if (rpc->printf_(c, "Set %2d:", set) < 0) return;
for (node = 0; node < (long int) ds_setlen_b[set]; node++) {
- if (rpc->printf(c, " node %3d %s",
+ if (rpc->printf_(c, " node %3d %s",
node, ds_setp_b[set][node]) < 0) return;
}
}
}
}
- rpc->printf(c, "End of dispatcher list");
+ rpc->printf_(c, "End of dispatcher list");
return;
}
@@ -106,9 +106,9 @@
LOG(L_ERR, "DISPATCHER module reloading\n");
if (ds_load_list(dslistfile) == 0) {
DS_SWITCH_ACTIVE_LIST
- rpc->printf(c, "dispatcher list %d activated", *ds_activelist);
+ rpc->printf_(c, "dispatcher list %d activated", *ds_activelist);
} else {
- rpc->printf(c, "dispatcher list reload failed");
+ rpc->printf_(c, "dispatcher list reload failed");
}
return ;
}
--- ./obsolete/presence_b2b/rpc.c 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./obsolete/presence_b2b/rpc.c 2014-07-24 02:15:29.953863554 +0400
@@ -95,7 +95,7 @@
rpc->fault(c, 200, "OK");
- rpc->printf(c, "%s", "Presence B2BUA Trace:");
+ rpc->printf_(c, "%s", "Presence B2BUA Trace:");
rpc_lf(rpc, c);
if (euac_internals) {
@@ -117,7 +117,7 @@
rpc_lf(rpc, c);
}
else {
- rpc->printf(c, "euac_internals not set!");
+ rpc->printf_(c, "euac_internals not set!");
}
rpc->send(c);
--- ./obsolete/ratelimit/ratelimit.c 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./obsolete/ratelimit/ratelimit.c 2014-07-24 02:15:30.053863365 +0400
@@ -345,13 +345,13 @@
static void rpc_stats(rpc_t *rpc, void *c) {
#if defined(RL_WITH_RED)
- if (rpc->printf(c, " INVITE: %d/%d (drop rate: %d)", *invite_counter,
+ if (rpc->printf_(c, " INVITE: %d/%d (drop rate: %d)", *invite_counter,
*invite_limit, *invite_load) < 0) return;
rpc_lf(rpc, c);
- if (rpc->printf(c, " REGISTER: %d/%d (drop rate: %d)", *register_counter,
+ if (rpc->printf_(c, " REGISTER: %d/%d (drop rate: %d)", *register_counter,
*register_limit, *register_load) < 0) return;
rpc_lf(rpc, c);
- if (rpc->printf(c, "SUBSCRIBE: %d/%d (drop rate: %d)", *subscribe_counter,
+ if (rpc->printf_(c, "SUBSCRIBE: %d/%d (drop rate: %d)", *subscribe_counter,
*subscribe_limit, *subscribe_load) < 0) return;
rpc_lf(rpc, c);
#else
--- ./obsolete/pa/rpc.c 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./obsolete/pa/rpc.c 2014-07-24 02:15:29.941863576 +0400
@@ -21,7 +21,7 @@
presence_note_t *n;
extension_element_t *ps;
- rpc->printf(c, " %.*s contact=\'%.*s\' exp=%u "
+ rpc->printf_(c, " %.*s contact=\'%.*s\' exp=%u "
"status=%d published=%d (id=%.*s)",
FMT_STR(t->data.id),
FMT_STR(t->data.contact), t->expires - time(NULL),
@@ -29,37 +29,37 @@
t->is_published, FMT_STR(t->published_id));
rpc_lf(rpc, c);
- rpc->printf(c, " notes:");
+ rpc->printf_(c, " notes:");
n = t->data.first_note;
while (n) {
- rpc->printf(c, " \'%.*s\'", FMT_STR(n->value));
+ rpc->printf_(c, " \'%.*s\'", FMT_STR(n->value));
n = n->next;
}
rpc_lf(rpc, c);
- rpc->printf(c, " extension elements:");
+ rpc->printf_(c, " extension elements:");
rpc_lf(rpc, c);
ps = t->data.first_unknown_element;
while (ps) {
rpc_lf(rpc, c);
- rpc->printf(c, " %.*s", FMT_STR(ps->element));
+ rpc->printf_(c, " %.*s", FMT_STR(ps->element));
rpc_lf(rpc, c);
ps = ps->next;
}
rpc_lf(rpc, c);
- rpc->printf(c, " status extension elements:");
+ rpc->printf_(c, " status extension elements:");
rpc_lf(rpc, c);
ps = t->data.status.first_unknown_element;
while (ps) {
rpc_lf(rpc, c);
- rpc->printf(c, " %.*s", FMT_STR(ps->element));
+ rpc->printf_(c, " %.*s", FMT_STR(ps->element));
rpc_lf(rpc, c);
ps = ps->next;
}
rpc_lf(rpc, c);
- rpc->printf(c, "");
+ rpc->printf_(c, "");
}
static void trace_presentity(presentity_t *p, rpc_t* rpc, void* c)
@@ -70,11 +70,11 @@
pa_presence_note_t *n;
pa_extension_element_t *ps;
- rpc->printf(c, "* %.*s (uid=%.*s)", FMT_STR(p->data.uri),
+ rpc->printf_(c, "* %.*s (uid=%.*s)", FMT_STR(p->data.uri),
FMT_STR(p->uuid));
rpc_lf(rpc, c);
- rpc->printf(c, " - tuples:");
+ rpc->printf_(c, " - tuples:");
rpc_lf(rpc, c);
t = get_first_tuple(p);
while (t) {
@@ -82,54 +82,54 @@
t = get_next_tuple(t);
}
- rpc->printf(c, " - watchers:");
+ rpc->printf_(c, " - watchers:");
rpc_lf(rpc, c);
w = p->first_watcher;
while (w) {
- rpc->printf(c, " %.*s status=%d exp=%u",
+ rpc->printf_(c, " %.*s status=%d exp=%u",
FMT_STR(w->uri), (int)w->status, w->expires - time(NULL));
rpc_lf(rpc, c);
w = w->next;
}
- rpc->printf(c, " - winfo watchers:");
+ rpc->printf_(c, " - winfo watchers:");
rpc_lf(rpc, c);
w = p->first_winfo_watcher;
while (w) {
- rpc->printf(c, " %.*s status=%d exp=%u",
+ rpc->printf_(c, " %.*s status=%d exp=%u",
FMT_STR(w->uri), (int)w->status, w->expires - time(NULL));
rpc_lf(rpc, c);
w = w->next;
}
- rpc->printf(c, " - internal watchers:");
+ rpc->printf_(c, " - internal watchers:");
rpc_lf(rpc, c);
iw = p->first_qsa_subscription;
while (iw) {
- rpc->printf(c, " %.*s %d",
+ rpc->printf_(c, " %.*s %d",
FMT_STR(*get_subscriber_id(iw->subscription)), (int)iw->status);
rpc_lf(rpc, c);
iw = iw->next;
}
- rpc->printf(c, " - notes:");
+ rpc->printf_(c, " - notes:");
rpc_lf(rpc, c);
n = get_first_note(p);
while (n) {
- rpc->printf(c, " %.*s (%.*s) exp=%s",
+ rpc->printf_(c, " %.*s (%.*s) exp=%s",
FMT_STR(n->data.value), FMT_STR(n->data.lang),
ctime(&n->expires));
n = get_next_note(n);
}
rpc_lf(rpc, c);
- rpc->printf(c, " - extension elements:");
+ rpc->printf_(c, " - extension elements:");
rpc_lf(rpc, c);
ps = get_first_extension(p);
while (ps) {
- rpc->printf(c, " exp=%d", (int)(ps->expires - time(NULL)));
+ rpc->printf_(c, " exp=%d", (int)(ps->expires - time(NULL)));
rpc_lf(rpc, c);
- rpc->printf(c, " %.*s", FMT_STR(ps->data.element));
+ rpc->printf_(c, " %.*s", FMT_STR(ps->data.element));
rpc_lf(rpc, c);
ps = get_next_extension(ps);
}
@@ -155,7 +155,7 @@
}
rpc_lf(rpc, c);
- rpc->printf(c, "presentity count: %d", cnt);
+ rpc->printf_(c, "presentity count: %d", cnt);
unlock_pdomain(dl->d);
}
--- ./obsolete/rls/rpc.c 2014-06-12 18:17:28.000000000 +0400
+++ ../kamailio-4.1.4-my/./obsolete/rls/rpc.c 2014-07-24 02:15:30.113863250 +0400
@@ -18,16 +18,16 @@
static void trace_vs(rpc_t *rpc, void *c, virtual_subscription_t *vs, int details)
{
- rpc->printf(c, " Virtual subscriptions:");
+ rpc->printf_(c, " Virtual subscriptions:");
rpc_lf(rpc, c);
- rpc->printf(c, " -> URI = %.*s", FMT_STR(vs->uri));
+ rpc->printf_(c, " -> URI = %.*s", FMT_STR(vs->uri));
rpc_lf(rpc, c);
- rpc->printf(c, " -> status = %d", vs->status);
+ rpc->printf_(c, " -> status = %d", vs->status);
rpc_lf(rpc, c);
if (details > 0) {
- rpc->printf(c, " -> document = %.*s", FMT_STR(vs->state_document));
+ rpc->printf_(c, " -> document = %.*s", FMT_STR(vs->state_document));
rpc_lf(rpc, c);
}
@@ -41,11 +41,11 @@
switch (s->type) {
case rls_internal_subscription:
- rpc->printf(c, "URI = %.*s", FMT_STR(*s->u.internal.record_id));
+ rpc->printf_(c, "URI = %.*s", FMT_STR(*s->u.internal.record_id));
rpc_lf(rpc, c);
break;
case rls_external_subscription:
- rpc->printf(c, "URI = %.*s", FMT_STR(s->u.external.record_id));
+ rpc->printf_(c, "URI = %.*s", FMT_STR(s->u.external.record_id));
rpc_lf(rpc, c);
break;
}
@@ -74,7 +74,7 @@
rpc->add(c, "s", "RLS Trace:");
if (!rls) {
- rpc->printf(c, "problems");
+ rpc->printf_(c, "problems");
rpc->send(c);
return;
}
@@ -86,7 +86,7 @@
if (details > 0) rls_trace_subscription(rpc, c, rs, details);
s = s->next;
}
- rpc->printf(c, "subscription count: %d", i);
+ rpc->printf_(c, "subscription count: %d", i);
rpc_lf(rpc, c);
rpc->send(c);
--- ./obsolete/fifo/fifo_server.c 2014-06-12 18:17:27.000000000 +0400
+++ ../kamailio-4.1.4-my/./obsolete/fifo/fifo_server.c 2014-07-24 02:15:30.065863342 +0400
@@ -920,7 +920,7 @@
func_param.fault = (rpc_fault_f)rpc_fault;
func_param.add = (rpc_add_f)rpc_add;
func_param.scan = (rpc_scan_f)rpc_scan;
- func_param.printf = (rpc_printf_f)rpc_printf;
+ func_param.printf_ = (rpc_printf_f)rpc_printf;
func_param.struct_add = (rpc_struct_add_f)rpc_struct_add;
func_param.struct_scan = (rpc_struct_scan_f)rpc_struct_scan;
func_param.struct_printf = (rpc_struct_printf_f)rpc_struct_printf;
--- ./dns_cache.c 2014-06-12 18:17:26.000000000 +0400
+++ ../kamailio-4.1.4-my/./dns_cache.c 2014-07-24 02:17:02.901484709 +0400
@@ -3814,21 +3814,21 @@
now=get_ticks_raw();
expires = (s_ticks_t)(e->expire-now)<0?-1: TICKS_TO_S(e->expire-now);
- rpc->printf(ctx, "%sname: %s", SPACE_FORMAT, e->name);
- rpc->printf(ctx, "%stype: %s", SPACE_FORMAT, print_type(e->type));
- rpc->printf(ctx, "%ssize (bytes): %d", SPACE_FORMAT,
+ rpc->printf_(ctx, "%sname: %s", SPACE_FORMAT, e->name);
+ rpc->printf_(ctx, "%stype: %s", SPACE_FORMAT, print_type(e->type));
+ rpc->printf_(ctx, "%ssize (bytes): %d", SPACE_FORMAT,
e->total_size);
- rpc->printf(ctx, "%sreference counter: %d", SPACE_FORMAT,
+ rpc->printf_(ctx, "%sreference counter: %d", SPACE_FORMAT,
e->refcnt.val);
if (e->ent_flags & DNS_FLAG_PERMANENT) {
- rpc->printf(ctx, "%spermanent: yes", SPACE_FORMAT);
+ rpc->printf_(ctx, "%spermanent: yes", SPACE_FORMAT);
} else {
- rpc->printf(ctx, "%spermanent: no", SPACE_FORMAT);
- rpc->printf(ctx, "%sexpires in (s): %d", SPACE_FORMAT, expires);
+ rpc->printf_(ctx, "%spermanent: no", SPACE_FORMAT);
+ rpc->printf_(ctx, "%sexpires in (s): %d", SPACE_FORMAT, expires);
}
- rpc->printf(ctx, "%slast used (s): %d", SPACE_FORMAT,
+ rpc->printf_(ctx, "%slast used (s): %d", SPACE_FORMAT,
TICKS_TO_S(now-e->last_used));
- rpc->printf(ctx, "%snegative entry: %s", SPACE_FORMAT,
+ rpc->printf_(ctx, "%snegative entry: %s", SPACE_FORMAT,
(e->ent_flags & DNS_FLAG_BAD_NAME) ? "yes" : "no");
for (rr=e->rr_lst; rr; rr=rr->next) {
@@ -3836,74 +3836,74 @@
case T_A:
case T_AAAA:
if (dns_rr2ip(e->type, rr, &ip)==0){
- rpc->printf(ctx, "%srr ip: %s", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr ip: %s", SPACE_FORMAT,
ip_addr2a(&ip) );
}else{
- rpc->printf(ctx, "%srr ip: <error: bad rr>",
+ rpc->printf_(ctx, "%srr ip: <error: bad rr>",
SPACE_FORMAT);
}
break;
case T_SRV:
- rpc->printf(ctx, "%srr name: %s", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr name: %s", SPACE_FORMAT,
((struct srv_rdata*)(rr->rdata))->name);
- rpc->printf(ctx, "%srr port: %d", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr port: %d", SPACE_FORMAT,
((struct srv_rdata*)(rr->rdata))->port);
- rpc->printf(ctx, "%srr priority: %d", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr priority: %d", SPACE_FORMAT,
((struct srv_rdata*)(rr->rdata))->priority);
- rpc->printf(ctx, "%srr weight: %d", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr weight: %d", SPACE_FORMAT,
((struct srv_rdata*)(rr->rdata))->weight);
break;
case T_NAPTR:
- rpc->printf(ctx, "%srr order: %d", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr order: %d", SPACE_FORMAT,
((struct naptr_rdata*)(rr->rdata))->order);
- rpc->printf(ctx, "%srr preference: %d", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr preference: %d", SPACE_FORMAT,
((struct naptr_rdata*)(rr->rdata))->pref);
s.s = ((struct naptr_rdata*)(rr->rdata))->flags;
s.len = ((struct naptr_rdata*)(rr->rdata))->flags_len;
- rpc->printf(ctx, "%srr flags: %.*s", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr flags: %.*s", SPACE_FORMAT,
s.len, s.s);
s.s=((struct naptr_rdata*)(rr->rdata))->services;
s.len=((struct naptr_rdata*)(rr->rdata))->services_len;
- rpc->printf(ctx, "%srr service: %.*s", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr service: %.*s", SPACE_FORMAT,
s.len, s.s);
s.s = ((struct naptr_rdata*)(rr->rdata))->regexp;
s.len = ((struct naptr_rdata*)(rr->rdata))->regexp_len;
- rpc->printf(ctx, "%srr regexp: %.*s", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr regexp: %.*s", SPACE_FORMAT,
s.len, s.s);
s.s = ((struct naptr_rdata*)(rr->rdata))->repl;
s.len = ((struct naptr_rdata*)(rr->rdata))->repl_len;
- rpc->printf(ctx, "%srr replacement: %.*s",
+ rpc->printf_(ctx, "%srr replacement: %.*s",
SPACE_FORMAT, s.len, s.s);
break;
case T_CNAME:
- rpc->printf(ctx, "%srr name: %s", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr name: %s", SPACE_FORMAT,
((struct cname_rdata*)(rr->rdata))->name);
break;
case T_TXT:
for (i=0; i<((struct txt_rdata*)(rr->rdata))->cstr_no;
i++){
- rpc->printf(ctx, "%stxt[%d]: %s", SPACE_FORMAT, i,
+ rpc->printf_(ctx, "%stxt[%d]: %s", SPACE_FORMAT, i,
((struct txt_rdata*)(rr->rdata))->txt[i].cstr);
}
break;
case T_EBL:
- rpc->printf(ctx, "%srr position: %d", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr position: %d", SPACE_FORMAT,
((struct ebl_rdata*)(rr->rdata))->position);
- rpc->printf(ctx, "%srr separator: %s", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr separator: %s", SPACE_FORMAT,
((struct ebl_rdata*)(rr->rdata))->separator);
- rpc->printf(ctx, "%srr apex: %s", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr apex: %s", SPACE_FORMAT,
((struct ebl_rdata*)(rr->rdata))->apex);
break;
case T_PTR:
- rpc->printf(ctx, "%srr name: %s", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr name: %s", SPACE_FORMAT,
((struct ptr_rdata*)(rr->rdata))->ptrdname);
break;
default:
- rpc->printf(ctx, "%sresource record: unknown",
+ rpc->printf_(ctx, "%sresource record: unknown",
SPACE_FORMAT);
}
if ((e->ent_flags & DNS_FLAG_PERMANENT) == 0)
- rpc->printf(ctx, "%srr expires in (s): %d", SPACE_FORMAT,
+ rpc->printf_(ctx, "%srr expires in (s): %d", SPACE_FORMAT,
(s_ticks_t)(rr->expire-now)<0?-1 :
TICKS_TO_S(rr->expire-now));
}
@@ -3931,9 +3931,9 @@
) {
continue;
}
- rpc->printf(ctx, "{\n");
+ rpc->printf_(ctx, "{\n");
dns_cache_print_entry(rpc, ctx, e);
- rpc->printf(ctx, "}");
+ rpc->printf_(ctx, "}");
}
}
UNLOCK_DNS_HASH();
