pidgin/pidgin

Move libzephyr declarations to zephyr_internal.h

2020-12-18, Arkadiy Illarionov
4942603c98ae
Parents 0d388fcfd3bf
Children 14dfad2f0a87
Move libzephyr declarations to zephyr_internal.h

Also fix build warning.

This is a repost of https://reviews.imfreedom.org/r/272/ from rbt.

Testing Done:
Compiled with -Dzephyr=disabled and -Dzephyr=enabled.

Reviewed at https://reviews.imfreedom.org/r/292/
4 files changed, 3 insertions(+), 10 deletions(-)
  • +0 -3
    libpurple/protocols/zephyr/ZGetLocs.c
  • +0 -3
    libpurple/protocols/zephyr/ZGetSubs.c
  • +1 -4
    libpurple/protocols/zephyr/zephyr.c
  • +2 -0
    libpurple/protocols/zephyr/zephyr_internal.h
    • --- a/libpurple/protocols/zephyr/ZGetLocs.c Fri Dec 18 03:22:13 2020 -0600
    +++ b/libpurple/protocols/zephyr/ZGetLocs.c Fri Dec 18 04:26:19 2020 -0600
    @@ -10,9 +10,6 @@
    #include "internal.h"
    -/* Prototype for -Wmissing-prototypes */
    -Code_t ZGetLocations(ZLocations_t *location, int *numlocs);
    -
    Code_t ZGetLocations(ZLocations_t *location, int *numlocs)
    {
    int i;
    --- a/libpurple/protocols/zephyr/ZGetSubs.c Fri Dec 18 03:22:13 2020 -0600
    +++ b/libpurple/protocols/zephyr/ZGetSubs.c Fri Dec 18 04:26:19 2020 -0600
    @@ -10,9 +10,6 @@
    #include "internal.h"
    -/* Prototype for -Wmissing-prototypes */
    -Code_t ZGetSubscriptions(ZSubscription_t *subscription, int *numsubs);
    -
    Code_t ZGetSubscriptions(ZSubscription_t *subscription, int *numsubs)
    {
    int i;
    --- a/libpurple/protocols/zephyr/zephyr.c Fri Dec 18 03:22:13 2020 -0600
    +++ b/libpurple/protocols/zephyr/zephyr.c Fri Dec 18 04:26:19 2020 -0600
    @@ -60,9 +60,6 @@
    #ifdef LIBZEPHYR_EXT
    extern char __Zephyr_realm[];
    -#else
    -extern Code_t ZGetLocations(ZLocations_t *, int *);
    -extern Code_t ZGetSubscriptions(ZSubscription_t *, int*);
    #endif
    typedef struct _zframe zframe;
    @@ -1328,7 +1325,7 @@
    }
    static gboolean
    -zephyr_request_locations(zephyr_account *zephyr, const gchar *who)
    +zephyr_request_locations(zephyr_account *zephyr, gchar *who)
    {
    if (use_zeph02(zephyr)) {
    ZAsyncLocateData_t ald;
    --- a/libpurple/protocols/zephyr/zephyr_internal.h Fri Dec 18 03:22:13 2020 -0600
    +++ b/libpurple/protocols/zephyr/zephyr_internal.h Fri Dec 18 04:26:19 2020 -0600
    @@ -206,11 +206,13 @@
    Code_t ZFlushMyLocations(void);
    Code_t ZFormatRawNotice(ZNotice_t *, char **, int *);
    Code_t ZRetrieveSubscriptions(unsigned short, int *);
    +Code_t ZGetSubscriptions(ZSubscription_t *, int *);
    Code_t ZOpenPort(unsigned short *port);
    Code_t ZClosePort(void);
    Code_t ZFlushLocations(void);
    Code_t ZFlushSubscriptions(void);
    Code_t ZFreeNotice(ZNotice_t *notice);
    +Code_t ZGetLocations(ZLocations_t *, int *);
    Code_t ZParseLocations(register ZNotice_t *notice,
    register ZAsyncLocateData_t *zald, int *nlocs,
    char **user);