pidgin/pidgin

Use g_rename directly instead of rename.

2019-10-30, Elliott Sales de Andrade
dd7183cf0a71
Parents 5f6a8bcd216d
Children 8e6d91e4dd8f
Use g_rename directly instead of rename.

This removes the need for extra compatibility macros, and thus hacks to
_undo_ the macro too.
3 files changed, 2 insertions(+), 10 deletions(-)
  • +0 -5
    libpurple/prefs.c
  • +2 -2
    libpurple/protocols/zephyr/ZVariables.c
  • +0 -3
    libpurple/win32/libc_interface.h
    • --- a/libpurple/prefs.c Wed Oct 30 22:04:59 2019 -0400
    +++ b/libpurple/prefs.c Wed Oct 30 22:19:59 2019 -0400
    @@ -1308,11 +1308,6 @@
    {
    struct purple_pref *oldpref, *newpref;
    -/* win32dep.h causes rename to be defined as wpurple_rename, so we need to undefine it here */
    -#if defined(_WIN32) && defined(rename)
    -#undef rename
    -#endif
    -
    PURPLE_PREFS_UI_OP_CALL(rename, oldname, newname);
    oldpref = find_pref(oldname);
    --- a/libpurple/protocols/zephyr/ZVariables.c Wed Oct 30 22:04:59 2019 -0400
    +++ b/libpurple/protocols/zephyr/ZVariables.c Wed Oct 30 22:19:59 2019 -0400
    @@ -87,7 +87,7 @@
    g_free(varfile);
    return(EIO); /* can't rely on errno */
    }
    - if (rename(varfilebackup, varfile)) {
    + if (g_rename(varfilebackup, varfile)) {
    g_free(varfilebackup);
    g_free(varfile);
    return (errno);
    @@ -127,7 +127,7 @@
    g_free(varfile);
    return(EIO); /* errno isn't reliable */
    }
    - if (rename(varfilebackup, varfile)) {
    + if (g_rename(varfilebackup, varfile)) {
    g_free(varfilebackup);
    g_free(varfile);
    return (errno);
    --- a/libpurple/win32/libc_interface.h Wed Oct 30 22:04:59 2019 -0400
    +++ b/libpurple/win32/libc_interface.h Wed Oct 30 22:19:59 2019 -0400
    @@ -142,9 +142,6 @@
    # define vsnprintf _vsnprintf
    #endif
    -#define rename( oldname, newname ) \
    -g_rename( oldname, newname )
    -
    /* time.h */
    /* XXX: it may be also defined by pthread.h */
    #undef localtime_r