pidgin/pidgin

Inline zephyr z_call* macros.

2021-01-13, Elliott Sales de Andrade
1f67d7260477
Parents 4c3ee00e6107
Children d036174d9e22
Inline zephyr z_call* macros.

Each one is used in only one place (though multiple times in each), so they
don't really help understanding anything.

Testing Done:
compiled only

Reviewed at https://reviews.imfreedom.org/r/421/
1 files changed, 32 insertions(+), 20 deletions(-)
  • +32 -20
    libpurple/protocols/zephyr/zephyr.c
    • --- a/libpurple/protocols/zephyr/zephyr.c Wed Jan 13 04:35:22 2021 -0600
    +++ b/libpurple/protocols/zephyr/zephyr.c Wed Jan 13 04:35:43 2021 -0600
    @@ -106,18 +106,6 @@
    int id;
    };
    -#define z_call(func) if (func != ZERR_NONE)\
    - return;
    -#define z_call_r(func) if (func != ZERR_NONE)\
    - return TRUE;
    -
    -#define z_call_s(func, err) if (func != ZERR_NONE) {\
    - purple_connection_error(\
    - purple_account_get_connection(zephyr->account),\
    - PURPLE_CONNECTION_ERROR_NETWORK_ERROR, err);\
    - return FALSE;\
    - }
    -
    #ifdef WIN32
    extern const char *username;
    #endif
    @@ -849,7 +837,9 @@
    ZNotice_t notice;
    /* XXX add real error reporting */
    - z_call_r(ZReceiveNotice(&notice, NULL));
    + if (ZReceiveNotice(&notice, NULL) != ZERR_NONE) {
    + return TRUE;
    + }
    switch (notice.z_kind) {
    case UNSAFE:
    @@ -1402,10 +1392,26 @@
    static gboolean
    login_zeph02(zephyr_account *zephyr)
    {
    - /* XXX z_call_s should actually try to report the com_err determined error */
    - z_call_s(ZInitialize(), "Couldn't initialize zephyr");
    - z_call_s(ZOpenPort(&(zephyr->port)), "Couldn't open port");
    - z_call_s(ZSetLocation(zephyr->exposure), "Couldn't set location");
    + PurpleConnection *pc = purple_account_get_connection(zephyr->account);
    +
    + /* XXX Should actually try to report the com_err determined error */
    + if (ZInitialize() != ZERR_NONE) {
    + purple_connection_error(pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
    + "Couldn't initialize zephyr");
    + return FALSE;
    + }
    +
    + if (ZOpenPort(&(zephyr->port)) != ZERR_NONE) {
    + purple_connection_error(pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
    + "Couldn't open port");
    + return FALSE;
    + }
    +
    + if (ZSetLocation(zephyr->exposure) != ZERR_NONE) {
    + purple_connection_error(pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
    + "Couldn't set location");
    + return FALSE;
    + }
    zephyr->username = g_strdup(ZGetSender());
    zephyr->realm = get_zephyr_realm(zephyr->account, ZGetRealm());
    @@ -1596,9 +1602,15 @@
    g_source_remove(zephyr->loctimer);
    zephyr->loctimer = 0;
    if (use_zeph02(zephyr)) {
    - z_call(ZCancelSubscriptions(0));
    - z_call(ZUnsetLocation());
    - z_call(ZClosePort());
    + if (ZCancelSubscriptions(0) != ZERR_NONE) {
    + return;
    + }
    + if (ZUnsetLocation() != ZERR_NONE) {
    + return;
    + }
    + if (ZClosePort() != ZERR_NONE) {
    + return;
    + }
    } else {
    /* assume tzc */
    #ifdef G_OS_UNIX