From 86f45a5d4f6db762e85661dc30ec3acc88489623 Mon Sep 17 00:00:00 2001 From: Gabor Adam Toth Date: Thu, 3 Nov 2011 14:28:46 +0100 Subject: [PATCH] libpsyc refactoring --- src/pkg-psyc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pkg-psyc.c b/src/pkg-psyc.c index 1ce19a5..971d3cf 100644 --- a/src/pkg-psyc.c +++ b/src/pkg-psyc.c @@ -176,7 +176,7 @@ fill_header_from_mapping (svalue_t *key, svalue_t *val, void *extra) { } } - list = psyc_list_new(elems, VEC_SIZE(val->u.vec), PSYC_LIST_CHECK_LENGTH); + psyc_list_init(&list, elems, VEC_SIZE(val->u.vec), PSYC_LIST_CHECK_LENGTH); valuelen = list.length; value = pxalloc(valuelen); if (!value) { @@ -192,8 +192,8 @@ fill_header_from_mapping (svalue_t *key, svalue_t *val, void *extra) { return; // not reached } - m->header->modifiers[m->header->lines++] = - psyc_modifier_new(oper, name, namelen, value, valuelen, m->flag); + psyc_modifier_init(&m->header->modifiers[m->header->lines++], + oper, name, namelen, value, valuelen, m->flag); } /*-------------------------------------------------------------------------*/ @@ -259,12 +259,12 @@ f_psyc_render(svalue_t *sp) { blen = 0; } - packet = psyc_packet_new(headers[PACKET_ROUTING].modifiers, - headers[PACKET_ROUTING].lines, - headers[PACKET_ENTITY].modifiers, - headers[PACKET_ENTITY].lines, - meth, mlen, body, blen, - PSYC_PACKET_CHECK_LENGTH); + psyc_packet_init(&packet, headers[PACKET_ROUTING].modifiers, + headers[PACKET_ROUTING].lines, + headers[PACKET_ENTITY].modifiers, + headers[PACKET_ENTITY].lines, + meth, mlen, body, blen, + PSYC_PACKET_CHECK_LENGTH); #ifdef DEBUG printf("rendering... packet.length = %ld\n", packet.length);