pidgin/pidgin

Merged in default (pull request #637)

15 months ago, Gary Kramlich
9f3aa66e2beb
Merged in default (pull request #637)

Cleanup some Zephyr code

Approved-by: Gary Kramlich
  • +11 -15
    libpurple/protocols/zephyr/ZAsyncLocate.c
  • +2 -3
    libpurple/protocols/zephyr/ZCkAuth.c
  • +3 -5
    libpurple/protocols/zephyr/ZCkIfNot.c
  • +2 -1
    libpurple/protocols/zephyr/ZClosePort.c
  • +2 -2
    libpurple/protocols/zephyr/ZCmpUID.c
  • +4 -6
    libpurple/protocols/zephyr/ZCmpUIDP.c
  • +2 -1
    libpurple/protocols/zephyr/ZFlsLocs.c
  • +2 -1
    libpurple/protocols/zephyr/ZFlsSubs.c
  • +3 -6
    libpurple/protocols/zephyr/ZFmtAuth.c
  • +3 -8
    libpurple/protocols/zephyr/ZFmtList.c
  • +3 -5
    libpurple/protocols/zephyr/ZFmtNotice.c
  • +2 -4
    libpurple/protocols/zephyr/ZFmtRaw.c
  • +3 -6
    libpurple/protocols/zephyr/ZFmtRawLst.c
  • +2 -4
    libpurple/protocols/zephyr/ZFmtSmRaw.c
  • +2 -2
    libpurple/protocols/zephyr/ZFreeNot.c
  • +2 -1
    libpurple/protocols/zephyr/ZGetSender.c
  • +2 -1
    libpurple/protocols/zephyr/ZGetWGPort.c
  • +3 -5
    libpurple/protocols/zephyr/ZIfNotice.c
  • +2 -5
    libpurple/protocols/zephyr/ZInit.c
  • +8 -9
    libpurple/protocols/zephyr/ZLocations.c
  • +6 -13
    libpurple/protocols/zephyr/ZMakeAscii.c
  • +3 -5
    libpurple/protocols/zephyr/ZMkAuth.c
  • +2 -4
    libpurple/protocols/zephyr/ZNewLocU.c
  • +2 -2
    libpurple/protocols/zephyr/ZOpenPort.c
  • +2 -4
    libpurple/protocols/zephyr/ZParseNot.c
  • +2 -3
    libpurple/protocols/zephyr/ZPeekNot.c
  • +2 -4
    libpurple/protocols/zephyr/ZPeekPkt.c
  • +2 -1
    libpurple/protocols/zephyr/ZPending.c
  • +6 -13
    libpurple/protocols/zephyr/ZReadAscii.c
  • +2 -3
    libpurple/protocols/zephyr/ZRecvNot.c
  • +2 -4
    libpurple/protocols/zephyr/ZRecvPkt.c
  • +2 -4
    libpurple/protocols/zephyr/ZRetSubs.c
  • +5 -11
    libpurple/protocols/zephyr/ZSendList.c
  • +5 -7
    libpurple/protocols/zephyr/ZSendNot.c
  • +2 -4
    libpurple/protocols/zephyr/ZSendPkt.c
  • +2 -2
    libpurple/protocols/zephyr/ZSetDest.c
  • +2 -2
    libpurple/protocols/zephyr/ZSetFD.c
  • +2 -2
    libpurple/protocols/zephyr/ZSetSrv.c
  • +12 -25
    libpurple/protocols/zephyr/ZSubs.c
  • +4 -5
    libpurple/protocols/zephyr/ZVariables.c
  • +3 -5
    libpurple/protocols/zephyr/ZWait4Not.c
  • +2 -3
    libpurple/protocols/zephyr/ZhmStat.c
  • +52 -53
    libpurple/protocols/zephyr/Zinternal.c
  • +0 -26
    libpurple/protocols/zephyr/com_err.h
  • +0 -64
    libpurple/protocols/zephyr/error_message.c
  • +0 -27
    libpurple/protocols/zephyr/error_table.h
  • +0 -48
    libpurple/protocols/zephyr/et_name.c
  • +0 -11
    libpurple/protocols/zephyr/init_et.c
  • +0 -6
    libpurple/protocols/zephyr/meson.build
  • +0 -6
    libpurple/protocols/zephyr/sysdep.h
  • +0 -53
    libpurple/protocols/zephyr/zephyr_err.c
  • +0 -5
    libpurple/protocols/zephyr/zephyr_err.h
  • --- a/libpurple/protocols/zephyr/ZAsyncLocate.c Sun Nov 10 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZAsyncLocate.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZCkAuth.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZCkIfNot.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZClosePort.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZCmpUID.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZCmpUIDP.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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(&notice->z_uid, (ZUnique_Id_t *) uid));
    }
    -int ZCompareMultiUIDPred(notice, uid)
    - ZNotice_t *notice;
    - void *uid;
    +int
    +ZCompareMultiUIDPred(ZNotice_t *notice, void *uid)
    {
    return (ZCompareUID(&notice->z_multiuid, (ZUnique_Id_t *) uid));
    }
    --- a/libpurple/protocols/zephyr/ZFlsLocs.c Sun Nov 10 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZFlsLocs.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZFlsSubs.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZFmtAuth.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZFmtList.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZFmtNotice.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZFmtRaw.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZFmtRawLst.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZFmtSmRaw.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZFreeNot.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZGetSender.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZGetWGPort.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZIfNotice.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZInit.c Mon Nov 11 02:38:00 2019 +0000
    @@ -29,7 +29,8 @@
    #define INADDR_NONE 0xffffffff
    #endif
    -Code_t ZInitialize()
    +Code_t
    +ZInitialize(void)
    {
    struct servent *hmserv;
    struct hostent *hostent;
    @@ -44,12 +45,8 @@
    char *krealm = NULL;
    int krbval;
    char d1[ANAME_SZ], d2[INST_SZ];
    -
    - /* initialize_krb_error_table(); */
    #endif
    - initialize_zeph_error_table();
    -
    (void) memset((char *)&__HM_addr, 0, sizeof(__HM_addr));
    __HM_addr.sin_family = AF_INET;
    --- a/libpurple/protocols/zephyr/ZLocations.c Sun Nov 10 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZLocations.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZMakeAscii.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZMkAuth.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZNewLocU.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZOpenPort.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZParseNot.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZPeekNot.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZPeekPkt.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZPending.c Mon Nov 11 02:38:00 2019 +0000
    @@ -10,7 +10,8 @@
    #include "internal.h"
    -int ZPending()
    +int
    +ZPending(void)
    {
    int retval;
    --- a/libpurple/protocols/zephyr/ZReadAscii.c Sun Nov 10 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZReadAscii.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZRecvNot.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZRecvPkt.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZRetSubs.c Mon Nov 11 02:38:00 2019 +0000
    @@ -35,10 +35,8 @@
    return(Z_RetSubs(&notice, 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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZSendList.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZSendNot.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZSendPkt.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZSetDest.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZSetFD.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZSetSrv.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZSubs.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZVariables.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZWait4Not.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/ZhmStat.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/Zinternal.c Mon Nov 11 02:38:00 2019 +0000
    @@ -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;
    --- a/libpurple/protocols/zephyr/com_err.h Sun Nov 10 09:52:48 2019 +0000
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,26 +0,0 @@
    -/*
    - * Header file for common error description library.
    - *
    - * Copyright 1988, Student Information Processing Board of the
    - * Massachusetts Institute of Technology.
    - *
    - * For copyright and distribution info, see the documentation supplied
    - * with this package.
    - */
    -
    -#ifndef PURPLE_ZEPHYR_COM_ERR_H
    -#define PURPLE_ZEPHYR_COM_ERR_H
    -
    -#define COM_ERR_BUF_LEN 25
    -
    -#include <stdarg.h>
    -
    -typedef void (*error_handler_t)(const char *, long, const char *, va_list);
    -extern error_handler_t com_err_hook;
    -void com_err(const char *, long, const char *, ...);
    -const char *error_message(long);
    -const char *error_message_r(long, char *);
    -error_handler_t set_com_err_hook(error_handler_t);
    -error_handler_t reset_com_err_hook(void);
    -
    -#endif /* PURPLE_ZEPHYR_COM_ERR_H */
    --- a/libpurple/protocols/zephyr/error_message.c Sun Nov 10 09:52:48 2019 +0000
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,64 +0,0 @@
    -/*
    - * Copyright 1987 by the Student Information Processing Board
    - * of the Massachusetts Institute of Technology
    - *
    - * For copyright info, see "mit-sipb-copyright.h".
    - */
    -
    -#include "error_table.h"
    -#include "com_err.h"
    -#include <sysdep.h>
    -
    -char *error_table_name_r(int, char *);
    -
    -struct et_list * _et_list = (struct et_list *) NULL;
    -
    -const char * error_message (code)
    -long code;
    -{
    - static char buf[COM_ERR_BUF_LEN];
    -
    - return(error_message_r(code, buf));
    -}
    -
    -const char * error_message_r (code, buf)
    -long code;
    -char *buf;
    -{
    - int offset;
    - struct et_list *et;
    - int table_num;
    - int started = 0;
    - char *cp, namebuf[6];
    -
    - offset = code & ((1<<ERRCODE_RANGE)-1);
    - table_num = code - offset;
    - if (!table_num)
    - return strerror(offset);
    - for (et = _et_list; et; et = et->next) {
    - if (et->table->base == table_num) {
    - /* This is the right table */
    - if (et->table->n_msgs <= offset)
    - break;
    - return(et->table->msgs[offset]);
    - }
    - }
    -
    - strcpy (buf, "Unknown code ");
    - strcat (buf, error_table_name_r (table_num, namebuf));
    - strcat (buf, " ");
    - for (cp = buf; *cp; cp++)
    - ;
    - if (offset >= 100) {
    - *cp++ = '0' + offset / 100;
    - offset %= 100;
    - started++;
    - }
    - if (started || offset >= 10) {
    - *cp++ = '0' + offset / 10;
    - offset %= 10;
    - }
    - *cp++ = '0' + offset;
    - *cp = '\0';
    - return(buf);
    -}
    --- a/libpurple/protocols/zephyr/error_table.h Sun Nov 10 09:52:48 2019 +0000
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,27 +0,0 @@
    -/*
    - * Copyright 1988 by the Student Information Processing Board of the
    - * Massachusetts Institute of Technology.
    - *
    - * For copyright info, see mit-sipb-copyright.h.
    - */
    -
    -#ifndef PURPLE_ZEPHYR_ERROR_TABLE_H
    -#define PURPLE_ZEPHYR_ERROR_TABLE_H
    -
    -struct error_table {
    - char const * const * msgs;
    - long base;
    - int n_msgs;
    -};
    -struct et_list {
    - struct et_list *next;
    - const struct error_table *table;
    -};
    -extern struct et_list * _et_list;
    -
    -#define ERRCODE_RANGE 8 /* # of bits to shift table number */
    -#define BITS_PER_CHAR 6 /* # bits to shift per character in name */
    -
    -const char *error_table_name(void);
    -
    -#endif /* PURPLE_ZEPHYR_ERROR_TABLE_H */
    --- a/libpurple/protocols/zephyr/et_name.c Sun Nov 10 09:52:48 2019 +0000
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,48 +0,0 @@
    -/*
    - * Copyright 1987 by MIT Student Information Processing Board
    - *
    - * For copyright info, see mit-sipb-copyright.h.
    - */
    -
    -#include <sysdep.h>
    -
    -
    -#define ERRCODE_RANGE 8 /* # of bits to shift table number */
    -#define BITS_PER_CHAR 6 /* # bits to shift per character in name */
    -
    -
    -static const char char_set[] =
    - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_";
    -
    -/* Prototypes for -Wmissing-prototypes */
    -const char * error_table_name(int num);
    -const char * error_table_name_r(int num, char *buf);
    -
    -const char * error_table_name_r(int num, char *buf)
    -{
    - int ch;
    - int i;
    - char *p;
    -
    - /* num = aa aaa abb bbb bcc ccc cdd ddd d?? ??? ??? */
    - p = buf;
    - num >>= ERRCODE_RANGE;
    - /* num = ?? ??? ??? aaa aaa bbb bbb ccc ccc ddd ddd */
    - num &= 077777777;
    - /* num = 00 000 000 aaa aaa bbb bbb ccc ccc ddd ddd */
    - for (i = 4; i >= 0; i--) {
    - ch = (num >> BITS_PER_CHAR * i) & ((1 << BITS_PER_CHAR) - 1);
    - if (ch != 0)
    - *p++ = char_set[ch-1];
    - }
    - *p = '\0';
    - return(buf);
    -}
    -
    -const char * error_table_name(int num)
    -{
    - static char buf[6];
    -
    - return(error_table_name_r(num, buf));
    -}
    -
    --- a/libpurple/protocols/zephyr/init_et.c Sun Nov 10 09:52:48 2019 +0000
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,11 +0,0 @@
    -/*
    - * Copyright 1986, 1987, 1988 by MIT Information Systems and
    - * the MIT Student Information Processing Board.
    - *
    - * For copyright info, see mit-sipb-copyright.h.
    - */
    -
    -#include <sysdep.h>
    -
    -extern struct et_list * _et_list;
    -
    --- a/libpurple/protocols/zephyr/meson.build Sun Nov 10 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/meson.build Mon Nov 11 02:38:00 2019 +0000
    @@ -44,16 +44,10 @@
    'ZWait4Not.c',
    'ZhmStat.c',
    'Zinternal.c',
    - 'com_err.h',
    - 'error_message.c',
    - 'error_table.h',
    - 'et_name.c',
    - 'init_et.c',
    'internal.h',
    'mit-copyright.h',
    'mit-sipb-copyright.h',
    'sysdep.h',
    - 'zephyr_err.c',
    'zephyr_err.h',
    'zephyr_internal.h',
    'zephyr.c',
    --- a/libpurple/protocols/zephyr/sysdep.h Sun Nov 10 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/sysdep.h Mon Nov 11 02:38:00 2019 +0000
    @@ -76,14 +76,8 @@
    # include <krb.h>
    # ifndef WIN32
    # include <krb_err.h>
    -# ifndef HAVE_KRB_GET_ERR_TEXT
    -# define krb_get_err_text(n) krb_err_txt[n]
    -# endif
    # endif /* WIN32 */
    # include <des.h>
    -# ifndef HAVE_KRB_LOG
    -# define krb_log log
    -# endif
    #endif /* ZEPHYR_USES_KERBEROS */
    #ifdef HAVE_SYS_SELECT_H
    --- a/libpurple/protocols/zephyr/zephyr_err.c Sun Nov 10 09:52:48 2019 +0000
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,53 +0,0 @@
    -#include "zephyr_err.h"
    -
    -static const char * const text[] = {
    - "Packet too long or buffer too small",
    - "Notice header too large",
    - "Illegal value in notice",
    - "Can't get host manager port",
    - "Can't assign port",
    - "Bad packet format",
    - "Incompatible version numbers",
    - "No port opened",
    - "No notices match criteria",
    - "Input queue too long",
    - "Hostmanager not responding",
    - "Internal error",
    - "No previous call to ZLocateUser",
    - "No more locations available",
    - "Field too long for buffer",
    - "Improperly formatted field",
    - "SERVNAK received",
    - "Server could not verify authentication",
    - "Not logged-in",
    - "No previous call to ZRetrieveSubscriptions",
    - "No more subscriptions available",
    - "Too many subscriptions to transmit",
    - "End of file detected during read",
    - 0
    -};
    -
    -struct error_table {
    - char const * const * msgs;
    - long base;
    - int n_msgs;
    -};
    -struct et_list {
    - struct et_list *next;
    - const struct error_table * table;
    -};
    -extern struct et_list *_et_list;
    -
    -static const struct error_table et = { text, -772103680L, 23 };
    -
    -static struct et_list link = { 0, 0 };
    -
    -void
    -initialize_zeph_error_table(void)
    -{
    - if (!link.table) {
    - link.next = _et_list;
    - link.table = &et;
    - _et_list = &link;
    - }
    -}
    --- a/libpurple/protocols/zephyr/zephyr_err.h Sun Nov 10 09:52:48 2019 +0000
    +++ b/libpurple/protocols/zephyr/zephyr_err.h Mon Nov 11 02:38:00 2019 +0000
    @@ -25,9 +25,4 @@
    #define ZERR_NOMORESUBSCRIPTIONS (-772103660L)
    #define ZERR_TOOMANYSUBS (-772103659L)
    #define ZERR_EOF (-772103658L)
    -void initialize_zeph_error_table (void);
    #define ERROR_TABLE_BASE_zeph (-772103680L)
    -
    -/* for compatibility with older versions... */
    -#define init_zeph_err_tbl initialize_zeph_error_table
    -#define zeph_err_base ERROR_TABLE_BASE_zeph