changeset
zephyr: Modernize K&R function prototypes.
Sun, 10 Nov 2019 05:20:10 -0500
- author
- Elliott Sales de Andrade <qulogic@pidgin.im>
- date
- Sun, 10 Nov 2019 05:20:10 -0500
- changeset 40166
- 811f82db29dd
- parent 40165
- 6bb197792c6d
- child 40167
- 9f3aa66e2beb
zephyr: Modernize K&R function prototypes.
--- a/libpurple/protocols/zephyr/ZAsyncLocate.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZAsyncLocate.c Sun Nov 10 05:20:10 2019 -0500 @@ -11,11 +11,10 @@ #include "internal.h" #include "util.h" -Code_t ZRequestLocations(user, zald, kind, auth) - const char *user; - ZAsyncLocateData_t *zald; - ZNotice_Kind_t kind; /* UNSAFE, UNACKED, or ACKED */ - Z_AuthProc auth; +Code_t +ZRequestLocations(const char *user, ZAsyncLocateData_t *zald, + ZNotice_Kind_t kind, /* UNSAFE, UNACKED, or ACKED */ + Z_AuthProc auth) { int retval; ZNotice_t notice; @@ -55,11 +54,9 @@ return(ZERR_NONE); } -Code_t ZParseLocations(notice,zald,nlocs,user) - ZNotice_t *notice; - ZAsyncLocateData_t *zald; - int *nlocs; - char **user; +Code_t +ZParseLocations(ZNotice_t *notice, ZAsyncLocateData_t *zald, int *nlocs, + char **user) { char *ptr, *end; int i; @@ -150,16 +147,15 @@ return (ZERR_NONE); } -int ZCompareALDPred(notice, zald) - ZNotice_t *notice; - void *zald; +int +ZCompareALDPred(ZNotice_t *notice, void *zald) { return(ZCompareUID(&(notice->z_multiuid), &(((ZAsyncLocateData_t *) zald)->uid))); } -void ZFreeALD(zald) - ZAsyncLocateData_t *zald; +void +ZFreeALD(ZAsyncLocateData_t *zald) { if (!zald) return;
--- a/libpurple/protocols/zephyr/ZCkAuth.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZCkAuth.c Sun Nov 10 05:20:10 2019 -0500 @@ -18,9 +18,8 @@ When not using Kerberos, return true if the notice claims to be authentic. Only used by clients; the server uses its own routine. */ -Code_t ZCheckAuthentication(notice, from) - ZNotice_t *notice; - struct sockaddr_in *from; +Code_t +ZCheckAuthentication(ZNotice_t *notice, struct sockaddr_in *from) { #ifdef ZEPHYR_USES_KERBEROS int result;
--- a/libpurple/protocols/zephyr/ZCkIfNot.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZCkIfNot.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,11 +10,9 @@ #include "internal.h" -Code_t ZCheckIfNotice(notice, from, predicate, args) - ZNotice_t *notice; - struct sockaddr_in *from; - register int (*predicate)(ZNotice_t *, void *); - void *args; +Code_t +ZCheckIfNotice(ZNotice_t *notice, struct sockaddr_in *from, + register int (*predicate)(ZNotice_t *, void *), void *args) { ZNotice_t tmpnotice; Code_t retval;
--- a/libpurple/protocols/zephyr/ZClosePort.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZClosePort.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,7 +10,8 @@ #include "internal.h" -Code_t ZClosePort() +Code_t +ZClosePort(void) { if (__Zephyr_fd >= 0 && __Zephyr_open) (void) close(__Zephyr_fd);
--- a/libpurple/protocols/zephyr/ZCmpUID.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZCmpUID.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,8 +10,8 @@ #include "internal.h" -int ZCompareUID(uid1, uid2) - ZUnique_Id_t *uid1, *uid2; +int +ZCompareUID(ZUnique_Id_t *uid1, ZUnique_Id_t *uid2) { return (!memcmp((char *)uid1, (char *)uid2, sizeof (*uid1))); }
--- a/libpurple/protocols/zephyr/ZCmpUIDP.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZCmpUIDP.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,16 +10,14 @@ #include "internal.h" -int ZCompareUIDPred(notice, uid) - ZNotice_t *notice; - void *uid; +int +ZCompareUIDPred(ZNotice_t *notice, void *uid) { return (ZCompareUID(¬ice->z_uid, (ZUnique_Id_t *) uid)); } -int ZCompareMultiUIDPred(notice, uid) - ZNotice_t *notice; - void *uid; +int +ZCompareMultiUIDPred(ZNotice_t *notice, void *uid) { return (ZCompareUID(¬ice->z_multiuid, (ZUnique_Id_t *) uid)); }
--- a/libpurple/protocols/zephyr/ZFlsLocs.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZFlsLocs.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,7 +10,8 @@ #include "internal.h" -Code_t ZFlushLocations() +Code_t +ZFlushLocations(void) { int i;
--- a/libpurple/protocols/zephyr/ZFlsSubs.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZFlsSubs.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,7 +10,8 @@ #include "internal.h" -Code_t ZFlushSubscriptions() +Code_t +ZFlushSubscriptions(void) { register int i;
--- a/libpurple/protocols/zephyr/ZFmtAuth.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZFmtAuth.c Sun Nov 10 05:20:10 2019 -0500 @@ -11,12 +11,9 @@ #include "internal.h" #ifdef ZEPHYR_USES_KERBEROS -Code_t ZFormatAuthenticNotice(notice, buffer, buffer_len, len, session) - ZNotice_t *notice; - register char *buffer; - register int buffer_len; - int *len; - C_Block session; +Code_t +ZFormatAuthenticNotice(ZNotice_t *notice, register char *buffer, + register int buffer_len, int *len, C_Block session) { ZNotice_t newnotice; char *ptr;
--- a/libpurple/protocols/zephyr/ZFmtList.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZFmtList.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,14 +10,9 @@ #include "internal.h" -Code_t ZFormatNoticeList(notice, list, nitems, buffer, ret_len, - cert_routine) - ZNotice_t *notice; - register char **list; - int nitems; - char **buffer; - int *ret_len; - Z_AuthProc cert_routine; +Code_t +ZFormatNoticeList(ZNotice_t *notice, register char **list, int nitems, + char **buffer, int *ret_len, Z_AuthProc cert_routine) { char header[Z_MAXHEADERLEN]; register int i;
--- a/libpurple/protocols/zephyr/ZFmtNotice.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZFmtNotice.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,11 +10,9 @@ #include "internal.h" -Code_t ZFormatNotice(notice, buffer, ret_len, cert_routine) - register ZNotice_t *notice; - char **buffer; - int *ret_len; - Z_AuthProc cert_routine; +Code_t +ZFormatNotice(register ZNotice_t *notice, char **buffer, int *ret_len, + Z_AuthProc cert_routine) { char header[Z_MAXHEADERLEN]; int hdrlen;
--- a/libpurple/protocols/zephyr/ZFmtRaw.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZFmtRaw.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,10 +10,8 @@ #include "internal.h" -Code_t ZFormatRawNotice(notice, buffer, ret_len) - register ZNotice_t *notice; - char **buffer; - int *ret_len; +Code_t +ZFormatRawNotice(register ZNotice_t *notice, char **buffer, int *ret_len) { char header[Z_MAXHEADERLEN]; int hdrlen;
--- a/libpurple/protocols/zephyr/ZFmtRawLst.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZFmtRawLst.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,12 +10,9 @@ #include "internal.h" -Code_t ZFormatRawNoticeList(notice, list, nitems, buffer, ret_len) - ZNotice_t *notice; - char *list[]; - int nitems; - char **buffer; - int *ret_len; +Code_t +ZFormatRawNoticeList(ZNotice_t *notice, char *list[], int nitems, char **buffer, + int *ret_len) { char header[Z_MAXHEADERLEN]; int hdrlen, i, size;
--- a/libpurple/protocols/zephyr/ZFmtSmRaw.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZFmtSmRaw.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,10 +10,8 @@ #include "internal.h" -Code_t ZFormatSmallRawNotice(notice, buffer, ret_len) - ZNotice_t *notice; - ZPacket_t buffer; - int *ret_len; +Code_t +ZFormatSmallRawNotice(ZNotice_t *notice, ZPacket_t buffer, int *ret_len) { Code_t retval; int hdrlen;
--- a/libpurple/protocols/zephyr/ZFreeNot.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZFreeNot.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,8 +10,8 @@ #include "internal.h" -Code_t ZFreeNotice(notice) - ZNotice_t *notice; +Code_t +ZFreeNotice(ZNotice_t *notice) { free(notice->z_packet); return 0;
--- a/libpurple/protocols/zephyr/ZGetSender.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZGetSender.c Sun Nov 10 05:20:10 2019 -0500 @@ -14,7 +14,8 @@ #include <pwd.h> #endif -char *ZGetSender() +char * +ZGetSender(void) { struct passwd *pw; #ifdef ZEPHYR_USES_KERBEROS
--- a/libpurple/protocols/zephyr/ZGetWGPort.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZGetWGPort.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,7 +10,8 @@ #include "internal.h" -int ZGetWGPort() +int +ZGetWGPort(void) { char *envptr, name[128]; FILE *fp;
--- a/libpurple/protocols/zephyr/ZIfNotice.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZIfNotice.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,11 +10,9 @@ #include "internal.h" -Code_t ZIfNotice(notice, from, predicate, args) - ZNotice_t *notice; - struct sockaddr_in *from; - int (*predicate)(ZNotice_t *, void *); - void *args; +Code_t +ZIfNotice(ZNotice_t *notice, struct sockaddr_in *from, + int (*predicate)(ZNotice_t *, void *), void *args) { ZNotice_t tmpnotice; Code_t retval;
--- a/libpurple/protocols/zephyr/ZInit.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZInit.c Sun Nov 10 05:20:10 2019 -0500 @@ -29,7 +29,8 @@ #define INADDR_NONE 0xffffffff #endif -Code_t ZInitialize() +Code_t +ZInitialize(void) { struct servent *hmserv; struct hostent *hostent;
--- a/libpurple/protocols/zephyr/ZLocations.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZLocations.c Sun Nov 10 05:20:10 2019 -0500 @@ -19,20 +19,22 @@ #include <stdlib.h> #include <errno.h> -Code_t ZSetLocation(exposure) - char *exposure; +Code_t +ZSetLocation(char *exposure) { return (Z_SendLocation(LOGIN_CLASS, exposure, ZAUTH, "$sender logged in to $1 on $3 at $2")); } -Code_t ZUnsetLocation() +Code_t +ZUnsetLocation(void) { return (Z_SendLocation(LOGIN_CLASS, LOGIN_USER_LOGOUT, ZNOAUTH, "$sender logged out of $1 on $3 at $2")); } -Code_t ZFlushMyLocations() +Code_t +ZFlushMyLocations(void) { return (Z_SendLocation(LOGIN_CLASS, LOGIN_USER_FLUSH, ZAUTH, "")); } @@ -41,11 +43,8 @@ static char *mytty = NULL; static int reenter = 0; -Code_t Z_SendLocation(class, opcode, auth, format) - char *class; - char *opcode; - Z_AuthProc auth; - char *format; +Code_t +Z_SendLocation(char *class, char *opcode, Z_AuthProc auth, char *format) { int retval; time_t ourtime;
--- a/libpurple/protocols/zephyr/ZMakeAscii.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZMakeAscii.c Sun Nov 10 05:20:10 2019 -0500 @@ -12,11 +12,8 @@ static char *itox_chars = "0123456789ABCDEF"; -Code_t ZMakeAscii(ptr, len, field, num) - register char *ptr; - int len; - unsigned char *field; - int num; +Code_t +ZMakeAscii(register char *ptr, int len, unsigned char *field, int num) { int i; @@ -45,10 +42,8 @@ return ZERR_NONE; } -Code_t ZMakeAscii32(ptr, len, value) - register char *ptr; - int len; - unsigned long value; +Code_t +ZMakeAscii32(register char *ptr, int len, unsigned long value) { if (len < 11) return ZERR_FIELDLEN; @@ -66,10 +61,8 @@ return ZERR_NONE; } -Code_t ZMakeAscii16(ptr, len, value) - register char *ptr; - int len; - unsigned int value; +Code_t +ZMakeAscii16(register char *ptr, int len, unsigned int value) { if (len < 7) return ZERR_FIELDLEN;
--- a/libpurple/protocols/zephyr/ZMkAuth.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZMkAuth.c Sun Nov 10 05:20:10 2019 -0500 @@ -24,11 +24,9 @@ static KTEXT_ST last_authent; #endif -Code_t ZMakeAuthentication(notice, buffer, buffer_len, len) - register ZNotice_t *notice; - char *buffer; - int buffer_len; - int *len; +Code_t +ZMakeAuthentication(register ZNotice_t *notice, char *buffer, int buffer_len, + int *len) { #ifdef ZEPHYR_USES_KERBEROS int result;
--- a/libpurple/protocols/zephyr/ZNewLocU.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZNewLocU.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,10 +10,8 @@ #include "internal.h" -Code_t ZLocateUser(user, nlocs, auth) - char *user; - int *nlocs; - Z_AuthProc auth; +Code_t +ZLocateUser(char *user, int *nlocs, Z_AuthProc auth) { Code_t retval; ZNotice_t notice;
--- a/libpurple/protocols/zephyr/ZOpenPort.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZOpenPort.c Sun Nov 10 05:20:10 2019 -0500 @@ -16,8 +16,8 @@ #include <sys/socket.h> #endif -Code_t ZOpenPort(port) - unsigned short *port; +Code_t +ZOpenPort(unsigned short *port) { struct sockaddr_in bindin; socklen_t len;
--- a/libpurple/protocols/zephyr/ZParseNot.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZParseNot.c Sun Nov 10 05:20:10 2019 -0500 @@ -60,10 +60,8 @@ #define next_field(ptr) ptr=next_field_1(ptr) #endif -Code_t ZParseNotice(buffer, len, notice) - char *buffer; - int len; - ZNotice_t *notice; +Code_t +ZParseNotice(char *buffer, int len, ZNotice_t *notice) { char *ptr, *end; unsigned long temp;
--- a/libpurple/protocols/zephyr/ZPeekNot.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZPeekNot.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,9 +10,8 @@ #include "internal.h" -Code_t ZPeekNotice(notice, from) - ZNotice_t *notice; - struct sockaddr_in *from; +Code_t +ZPeekNotice(ZNotice_t *notice, struct sockaddr_in *from) { char *buffer; int len;
--- a/libpurple/protocols/zephyr/ZPeekPkt.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZPeekPkt.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,10 +10,8 @@ #include "internal.h" -Code_t ZPeekPacket(buffer, ret_len, from) - char **buffer; - int *ret_len; - struct sockaddr_in *from; +Code_t +ZPeekPacket(char **buffer, int *ret_len, struct sockaddr_in *from) { Code_t retval; struct _Z_InputQ *nextq;
--- a/libpurple/protocols/zephyr/ZPending.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZPending.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,7 +10,8 @@ #include "internal.h" -int ZPending() +int +ZPending(void) { int retval;
--- a/libpurple/protocols/zephyr/ZReadAscii.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZReadAscii.c Sun Nov 10 05:20:10 2019 -0500 @@ -12,11 +12,8 @@ #define Z_cnvt_xtoi(c) ((temp=(c)-'0'),(temp<10)?(int)temp:((temp-='A'-'9'-1),(temp<16)?(int)temp:-1)) -Code_t ZReadAscii(ptr, len, field, num) - char *ptr; - int len; - unsigned char *field; - int num; +Code_t +ZReadAscii(char *ptr, int len, unsigned char *field, int num) { int i; unsigned int hexbyte; @@ -52,10 +49,8 @@ return *ptr ? ZERR_BADFIELD : ZERR_NONE; } -Code_t ZReadAscii32(ptr, len, value_ptr) - char *ptr; - int len; - unsigned long *value_ptr; +Code_t +ZReadAscii32(char *ptr, int len, unsigned long *value_ptr) { unsigned char buf[4]; unsigned long value = 0; @@ -72,10 +67,8 @@ return ZERR_NONE; } -Code_t ZReadAscii16(ptr, len, value_ptr) - char *ptr; - int len; - unsigned short *value_ptr; +Code_t +ZReadAscii16(char *ptr, int len, unsigned short *value_ptr) { unsigned char buf[2]; Code_t retval;
--- a/libpurple/protocols/zephyr/ZRecvNot.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZRecvNot.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,9 +10,8 @@ #include "internal.h" -Code_t ZReceiveNotice(notice, from) - ZNotice_t *notice; - struct sockaddr_in *from; +Code_t +ZReceiveNotice(ZNotice_t *notice, struct sockaddr_in *from) { char *buffer; struct _Z_InputQ *nextq;
--- a/libpurple/protocols/zephyr/ZRecvPkt.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZRecvPkt.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,10 +10,8 @@ #include "internal.h" -Code_t ZReceivePacket(buffer, ret_len, from) - ZPacket_t buffer; - int *ret_len; - struct sockaddr_in *from; +Code_t +ZReceivePacket(ZPacket_t buffer, int *ret_len, struct sockaddr_in *from) { Code_t retval; struct _Z_InputQ *nextq;
--- a/libpurple/protocols/zephyr/ZRetSubs.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZRetSubs.c Sun Nov 10 05:20:10 2019 -0500 @@ -35,10 +35,8 @@ return(Z_RetSubs(¬ice, nsubs, ZAUTH)); } -static Code_t Z_RetSubs(notice, nsubs, auth_routine) - register ZNotice_t *notice; - int *nsubs; - Z_AuthProc auth_routine; +static Code_t +Z_RetSubs(register ZNotice_t *notice, int *nsubs, Z_AuthProc auth_routine) { register int i; int retval,nrecv,gimmeack;
--- a/libpurple/protocols/zephyr/ZSendList.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZSendList.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,21 +10,15 @@ #include "internal.h" -Code_t ZSendList(notice, list, nitems, cert_routine) - ZNotice_t *notice; - char *list[]; - int nitems; - Z_AuthProc cert_routine; +Code_t +ZSendList(ZNotice_t *notice, char *list[], int nitems, Z_AuthProc cert_routine) { return(ZSrvSendList(notice, list, nitems, cert_routine, Z_XmitFragment)); } -Code_t ZSrvSendList(notice, list, nitems, cert_routine, send_routine) - ZNotice_t *notice; - char *list[]; - int nitems; - Z_AuthProc cert_routine; - Code_t (*send_routine)(); +Code_t +ZSrvSendList(ZNotice_t *notice, char *list[], int nitems, + Z_AuthProc cert_routine, Code_t (*send_routine)()) { Code_t retval; ZNotice_t newnotice;
--- a/libpurple/protocols/zephyr/ZSendNot.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZSendNot.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,17 +10,15 @@ #include "internal.h" -Code_t ZSendNotice(notice, cert_routine) - ZNotice_t *notice; - Z_AuthProc cert_routine; +Code_t +ZSendNotice(ZNotice_t *notice, Z_AuthProc cert_routine) { return(ZSrvSendNotice(notice, cert_routine, Z_XmitFragment)); } -Code_t ZSrvSendNotice(notice, cert_routine, send_routine) - ZNotice_t *notice; - Z_AuthProc cert_routine; - Code_t (*send_routine)(); +Code_t +ZSrvSendNotice(ZNotice_t *notice, Z_AuthProc cert_routine, + Code_t (*send_routine)()) { Code_t retval; ZNotice_t newnotice;
--- a/libpurple/protocols/zephyr/ZSendPkt.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZSendPkt.c Sun Nov 10 05:20:10 2019 -0500 @@ -17,10 +17,8 @@ static int wait_for_hmack(ZNotice_t *notice, void *uid); -Code_t ZSendPacket(packet, len, waitforack) - char *packet; - int len; - int waitforack; +Code_t +ZSendPacket(char *packet, int len, int waitforack) { Code_t retval; struct sockaddr_in dest;
--- a/libpurple/protocols/zephyr/ZSetDest.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZSetDest.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,8 +10,8 @@ #include "internal.h" -Code_t ZSetDestAddr(addr) - struct sockaddr_in *addr; +Code_t +ZSetDestAddr(struct sockaddr_in *addr) { __HM_addr = *addr;
--- a/libpurple/protocols/zephyr/ZSetFD.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZSetFD.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,8 +10,8 @@ #include "internal.h" -Code_t ZSetFD(fd) - int fd; +Code_t +ZSetFD(int fd) { (void) ZClosePort();
--- a/libpurple/protocols/zephyr/ZSetSrv.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZSetSrv.c Sun Nov 10 05:20:10 2019 -0500 @@ -10,8 +10,8 @@ #include "internal.h" -Code_t ZSetServerState(state) - int state; +Code_t +ZSetServerState(int state) { __Zephyr_server = state;
--- a/libpurple/protocols/zephyr/ZSubs.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZSubs.c Sun Nov 10 05:20:10 2019 -0500 @@ -16,33 +16,28 @@ static Code_t subscr_sendoff(ZNotice_t *notice, char **lyst, int num, int authit); -Code_t ZSubscribeTo(sublist, nitems, port) - ZSubscription_t *sublist; - int nitems; - unsigned int port; +Code_t +ZSubscribeTo(ZSubscription_t *sublist, int nitems, unsigned int port) { return (Z_Subscriptions(sublist, nitems, port, CLIENT_SUBSCRIBE, 1)); } -Code_t ZSubscribeToSansDefaults(sublist, nitems, port) - ZSubscription_t *sublist; - int nitems; - unsigned int port; +Code_t +ZSubscribeToSansDefaults(ZSubscription_t *sublist, int nitems, + unsigned int port) { return (Z_Subscriptions(sublist, nitems, port, CLIENT_SUBSCRIBE_NODEFS, 1)); } -Code_t ZUnsubscribeTo(sublist, nitems, port) - ZSubscription_t *sublist; - int nitems; - unsigned int port; +Code_t +ZUnsubscribeTo(ZSubscription_t *sublist, int nitems, unsigned int port) { return (Z_Subscriptions(sublist, nitems, port, CLIENT_UNSUBSCRIBE, 1)); } -Code_t ZCancelSubscriptions(port) - unsigned int port; +Code_t +ZCancelSubscriptions(unsigned int port) { return (Z_Subscriptions((ZSubscription_t *)0, 0, port, CLIENT_CANCELSUB, 0)); @@ -55,12 +50,8 @@ */ static Code_t -Z_Subscriptions(sublist, nitems, port, opcode, authit) - register ZSubscription_t *sublist; - int nitems; - unsigned int port; - char *opcode; - int authit; +Z_Subscriptions(register ZSubscription_t *sublist, int nitems, + unsigned int port, char *opcode, int authit) { register int i, j; int retval; @@ -160,11 +151,7 @@ } static Code_t -subscr_sendoff(notice, lyst, num, authit) -ZNotice_t *notice; -char **lyst; -int num; -int authit; +subscr_sendoff(ZNotice_t *notice, char **lyst, int num, int authit) { register Code_t retval; ZNotice_t retnotice;
--- a/libpurple/protocols/zephyr/ZVariables.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZVariables.c Sun Nov 10 05:20:10 2019 -0500 @@ -47,9 +47,8 @@ return ret; } -Code_t ZSetVariable(var, value) - char *var; - char *value; +Code_t +ZSetVariable(char *var, char *value) { int written; FILE *fpin, *fpout; @@ -97,8 +96,8 @@ return (ZERR_NONE); } -Code_t ZUnsetVariable(var) - char *var; +Code_t +ZUnsetVariable(char *var) { FILE *fpin, *fpout; char *varfile, *varfilebackup, varbfr[512];
--- a/libpurple/protocols/zephyr/ZWait4Not.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZWait4Not.c Sun Nov 10 05:20:10 2019 -0500 @@ -30,11 +30,9 @@ #include <sys/socket.h> #endif -Code_t Z_WaitForNotice (notice, pred, arg, timeout) - ZNotice_t *notice; - int (*pred)(ZNotice_t *, void *); - void *arg; - int timeout; +Code_t +Z_WaitForNotice(ZNotice_t *notice, int (*pred)(ZNotice_t *, void *), void *arg, + int timeout) { Code_t retval; struct timeval tv, t0;
--- a/libpurple/protocols/zephyr/ZhmStat.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/ZhmStat.c Sun Nov 10 05:20:10 2019 -0500 @@ -20,9 +20,8 @@ #define INADDR_LOOPBACK 0x7f000001 #endif -Code_t ZhmStat(hostaddr, notice) - struct in_addr *hostaddr; - ZNotice_t *notice; +Code_t +ZhmStat(struct in_addr *hostaddr, ZNotice_t *notice) { struct servent *sp; struct sockaddr_in sin;
--- a/libpurple/protocols/zephyr/Zinternal.c Sun Nov 10 04:58:08 2019 -0500 +++ b/libpurple/protocols/zephyr/Zinternal.c Sun Nov 10 05:20:10 2019 -0500 @@ -69,9 +69,8 @@ * order, so we can usually search for a uid or insert it into the buffer * by looking back just a few entries from the end. Since this code is * only executed by the client, the implementation isn't microoptimized. */ -static int find_or_insert_uid(uid, kind) - ZUnique_Id_t *uid; - ZNotice_Kind_t kind; +static int +find_or_insert_uid(ZUnique_Id_t *uid, ZNotice_Kind_t kind) { static struct _filter { ZUnique_Id_t uid; @@ -170,7 +169,8 @@ /* Read any available packets and enqueue them */ -Code_t Z_ReadEnqueue() +Code_t +Z_ReadEnqueue(void) { Code_t retval; @@ -220,7 +220,8 @@ * returns. */ -Code_t Z_ReadWait() +Code_t +Z_ReadWait(void) { register struct _Z_InputQ *qptr; ZNotice_t notice; @@ -468,10 +469,8 @@ /* Fragment management routines - compliments, more or less, of RFC815 */ -Code_t Z_AddNoticeToEntry(qptr, notice, part) - struct _Z_InputQ *qptr; - ZNotice_t *notice; - int part; +Code_t +Z_AddNoticeToEntry(struct _Z_InputQ *qptr, ZNotice_t *notice, int part) { int last, oldfirst, oldlast; struct _Z_Hole *hole, *lasthole; @@ -585,12 +584,9 @@ return (ZERR_NONE); } -Code_t Z_FormatHeader(notice, buffer, buffer_len, len, cert_routine) - ZNotice_t *notice; - char *buffer; - int buffer_len; - int *len; - Z_AuthProc cert_routine; +Code_t +Z_FormatHeader(ZNotice_t *notice, char *buffer, int buffer_len, int *len, + Z_AuthProc cert_routine) { Code_t retval; static char version[BUFSIZ]; /* default init should be all \0 */ @@ -630,12 +626,9 @@ return Z_FormatAuthHeader(notice, buffer, buffer_len, len, cert_routine); } -Code_t Z_FormatAuthHeader(notice, buffer, buffer_len, len, cert_routine) - ZNotice_t *notice; - char *buffer; - int buffer_len; - int *len; - Z_AuthProc cert_routine; +Code_t +Z_FormatAuthHeader(ZNotice_t *notice, char *buffer, int buffer_len, int *len, + Z_AuthProc cert_routine) { if (!cert_routine) { notice->z_auth = 0; @@ -649,12 +642,9 @@ return ((*cert_routine)(notice, buffer, buffer_len, len)); } -Code_t Z_FormatRawHeader(notice, buffer, buffer_len, len, cstart, cend) - ZNotice_t *notice; - char *buffer; - gsize buffer_len; - int *len; - char **cstart, **cend; +Code_t +Z_FormatRawHeader(ZNotice_t *notice, char *buffer, gsize buffer_len, int *len, + char **cstart, char **cend) { char newrecip[BUFSIZ]; char *ptr, *end; @@ -779,7 +769,8 @@ return 0; } -struct _Z_InputQ *Z_GetFirstComplete() +struct _Z_InputQ * +Z_GetFirstComplete(void) { struct _Z_InputQ *qptr; @@ -794,8 +785,8 @@ return ((struct _Z_InputQ *)0); } -struct _Z_InputQ *Z_GetNextComplete(qptr) - struct _Z_InputQ *qptr; +struct _Z_InputQ * +Z_GetNextComplete(struct _Z_InputQ *qptr) { qptr = qptr->next; while (qptr) { @@ -807,8 +798,8 @@ return ((struct _Z_InputQ *)0); } -void Z_RemQueue(qptr) - struct _Z_InputQ *qptr; +void +Z_RemQueue(struct _Z_InputQ *qptr) { struct _Z_Hole *hole, *nexthole; @@ -852,11 +843,9 @@ free ((char *)qptr); } -Code_t Z_SendFragmentedNotice(notice, len, cert_func, send_func) - ZNotice_t *notice; - int len; - Z_AuthProc cert_func; - Z_SendProc send_func; +Code_t +Z_SendFragmentedNotice(ZNotice_t *notice, int len, Z_AuthProc cert_func, + Z_SendProc send_func) { ZNotice_t partnotice; ZPacket_t buffer; @@ -908,11 +897,8 @@ } /*ARGSUSED*/ -Code_t Z_XmitFragment(notice, buf, len, wait) -ZNotice_t *notice; -char *buf; -int len; -int wait; +Code_t +Z_XmitFragment(ZNotice_t *notice, char *buf, int len, int wait) { return(ZSendPacket(buf, len, wait)); } @@ -938,31 +924,44 @@ va_end (pvar); } -void Z_debug_stderr (format, args, closure) - const char *format; - va_list args; - void *closure; +void +Z_debug_stderr(const char *format, va_list args, void *closure) { vfprintf (stderr, format, args); putc ('\n', stderr); } #undef ZGetFD -int ZGetFD () { return __Zephyr_fd; } +int +ZGetFD(void) +{ + return __Zephyr_fd; +} #undef ZQLength -int ZQLength () { return __Q_CompleteLength; } +int +ZQLength(void) +{ + return __Q_CompleteLength; +} #undef ZGetDestAddr -struct sockaddr_in ZGetDestAddr () { return __HM_addr; } +struct sockaddr_in +ZGetDestAddr(void) +{ + return __HM_addr; +} #undef ZGetRealm -Zconst char * ZGetRealm () { return __Zephyr_realm; } +Zconst char * +ZGetRealm(void) +{ + return __Zephyr_realm; +} #undef ZSetDebug -void ZSetDebug(proc, arg) - void (*proc)(const char *, va_list, void *); - char *arg; +void +ZSetDebug(void (*proc)(const char *, va_list, void *), char *arg) { __Z_debug_print = proc; __Z_debug_print_closure = arg;
