From dc0208b08c7df7c0e559b021bdffcebdb2dc221e Mon Sep 17 00:00:00 2001 From: Nate Straz Date: Tue, 13 Sep 2005 19:47:14 +0000 Subject: Merge qarsh revisions 1727:1738 from sistina-test branch djansa-qarsh. --- qarsh_packet.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'qarsh_packet.c') diff --git a/qarsh_packet.c b/qarsh_packet.c index 76fadf1..151beff 100644 --- a/qarsh_packet.c +++ b/qarsh_packet.c @@ -277,9 +277,6 @@ parse_qp_sendfile(xmlXPathContextPtr ctxt, struct qa_packet *qp) s = get_xpath_string(ctxt, "param[@name='of_port']"); qp->qp_sendfile.qp_of_port = atoi(s); free(s); - s = get_xpath_string(ctxt, "param[@name='count']"); - qp->qp_sendfile.qp_count = atoi(s); - free(s); return 0; } @@ -480,7 +477,7 @@ void string_qp_recvfile(xmlNodePtr node, struct qa_packet *qp) snprintf(tmpstr, 32, "%d", qp->qp_recvfile.qp_if_port); xmlAddChild(node, make_param("if_port", tmpstr)); - snprintf(tmpstr, 32, "%d", qp->qp_recvfile.qp_count); + snprintf(tmpstr, 32, "%zd", qp->qp_recvfile.qp_count); xmlAddChild(node, make_param("count", tmpstr)); snprintf(tmpstr, 32, "%d", qp->qp_recvfile.qp_mode); @@ -494,8 +491,6 @@ void string_qp_sendfile(xmlNodePtr node, struct qa_packet *qp) xmlAddChild(node, make_param("path", qp->qp_sendfile.qp_path)); snprintf(tmpstr, 32, "%d", qp->qp_sendfile.qp_of_port); xmlAddChild(node, make_param("of_port", tmpstr)); - snprintf(tmpstr, 32, "%d", qp->qp_sendfile.qp_count); - xmlAddChild(node, make_param("count", tmpstr)); } void string_qp_rstat(xmlNodePtr node, struct qa_packet *qp) @@ -672,7 +667,7 @@ make_qp_recvfile(const char *path, int if_port, size_t count, mode_t mode) } struct qa_packet * -make_qp_sendfile(const char *path, int of_port, size_t count) +make_qp_sendfile(const char *path, int of_port) { struct qa_packet *qp; qp = malloc(sizeof *qp); @@ -682,7 +677,6 @@ make_qp_sendfile(const char *path, int of_port, size_t count) qp->qp_type = QP_SENDFILE; qp->qp_sendfile.qp_path = strdup(path); qp->qp_sendfile.qp_of_port = of_port; - qp->qp_sendfile.qp_count = count; return qp; } @@ -818,7 +812,7 @@ dump_qp_recvfile(struct qa_packet *qp) { printf("\tpath: %s\n", qp->qp_recvfile.qp_path); printf("\tif_port: %d\n", qp->qp_recvfile.qp_if_port); - printf("\tcount: %d\n", qp->qp_recvfile.qp_count); + printf("\tcount: %zd\n", qp->qp_recvfile.qp_count); printf("\tmode: %o\n", qp->qp_recvfile.qp_mode); } @@ -827,7 +821,6 @@ dump_qp_sendfile(struct qa_packet *qp) { printf("\tpath: %s\n", qp->qp_sendfile.qp_path); printf("\tof_port: %d\n", qp->qp_sendfile.qp_of_port); - printf("\tcount: %d\n", qp->qp_sendfile.qp_count); } void -- cgit