X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Fpacket.c;h=c161f95c9f3a7c1019d555e6a6590138815f3684;hb=c2190a140fc0a40b9469ce497d089a27a2dfe0df;hp=2b2fdf98534ca5f7da7c7c1394211b06b56d1069;hpb=34197d9f46a5f4e944378cbb65fca32ee0eec7b9;p=debian%2Famanda diff --git a/common-src/packet.c b/common-src/packet.c index 2b2fdf9..c161f95 100644 --- a/common-src/packet.c +++ b/common-src/packet.c @@ -24,7 +24,7 @@ * file named AUTHORS, in the root directory of this distribution. */ /* - * $Id: packet.c,v 1.8.2.4 2006/12/18 20:43:50 martinea Exp $ + * $Id: packet.c,v 1.8 2006/05/25 01:47:12 johnfranks Exp $ * * Routines for modifying the amanda protocol packet type */ @@ -72,14 +72,15 @@ printf_arglist_function2(void pkt_init, pkt_t *, pkt, pktype_t, type, assert(pkt != NULL); assert(strcmp(pkt_type2str(type), "BOGUS") != 0); - assert(fmt != NULL); + if(fmt == NULL) + fmt = ""; pkt->type = type; pkt->packet_size = 1000; pkt->body = alloc(pkt->packet_size); while(1) { arglist_start(argp, fmt); - len = vsnprintf(pkt->body, pkt->packet_size, fmt, argp); + len = g_vsnprintf(pkt->body, pkt->packet_size, fmt, argp); arglist_end(argp); if (len > -1 && len < (int)(pkt->packet_size - 1)) break; @@ -107,7 +108,7 @@ printf_arglist_function1(void pkt_cat, pkt_t *, pkt, const char *, fmt) while(1) { arglist_start(argp, fmt); - lenX = vsnprintf(pkt->body + len, pkt->packet_size - len, fmt,argp); + lenX = g_vsnprintf(pkt->body + len, pkt->packet_size - len, fmt,argp); arglist_end(argp); if (lenX > -1 && lenX < (int)(pkt->packet_size - len - 1)) break;