Mercurial > pidgin.yaz
diff libpurple/protocols/zephyr/ZIfNotice.c @ 32010:ce968e115c95
propagate from branch 'im.pidgin.cpw.masca.p2p' (head 33ca865dacb9e5bcf763d06f6a42cbaca337cc64)
to branch 'im.pidgin.pidgin' (head 92f47f4e8b0cbb107fd97e1ab814d1cedbf109ad)
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Fri, 06 May 2011 06:25:14 +0000 |
parents | a8cc50c2279f |
children |
line wrap: on
line diff
--- a/libpurple/protocols/zephyr/ZIfNotice.c Tue Jan 04 05:05:06 2011 +0000 +++ b/libpurple/protocols/zephyr/ZIfNotice.c Fri May 06 06:25:14 2011 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1987,1988 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file - * "mit-copyright.h". + * "mit-copyright.h". */ #include "internal.h" @@ -23,12 +23,12 @@ if ((retval = Z_WaitForComplete()) != ZERR_NONE) return (retval); - + qptr = Z_GetFirstComplete(); - + for (;;) { while (qptr) { - if ((retval = ZParseNotice(qptr->packet, qptr->packet_len, + if ((retval = ZParseNotice(qptr->packet, qptr->packet_len, &tmpnotice)) != ZERR_NONE) return (retval); if ((*predicate)(&tmpnotice, args)) { @@ -37,7 +37,7 @@ (void) memcpy(buffer, qptr->packet, qptr->packet_len); if (from) *from = qptr->from; - if ((retval = ZParseNotice(buffer, qptr->packet_len, + if ((retval = ZParseNotice(buffer, qptr->packet_len, notice)) != ZERR_NONE) { free(buffer); return (retval);