mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-09 04:52:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

* xdirentry.h: Get rid of ifree(), it's equivalent to g_free().

Browse Source 
* direntry.c: Likewise.
* fish.c: Likewise.
* ftpfs.c: Likewise.
This commit is contained in:
Pavel Roskin 2002-07-19 16:04:27 +00:00
parent 87e4797648
commit 982a256ee0
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vfs/ChangeLog
View File

@ -1,5 +1,10 @@
2002-07-19 Pavel Roskin <proski@gnu.org> 2002-07-19 Pavel Roskin <proski@gnu.org>
* xdirentry.h: Get rid of ifree(), it's equivalent to g_free().
* direntry.c: Likewise.
* fish.c: Likewise.
* ftpfs.c: Likewise.
* fish.c (fish_fill_names): New function, replacement for * fish.c (fish_fill_names): New function, replacement for
generic vfs_s_fill_names() which didn't work right with fish. generic vfs_s_fill_names() which didn't work right with fish.

4
vfs/direntry.c
View File

@ -91,7 +91,7 @@ vfs_s_free_inode (vfs *me, vfs_s_inode *ino)
} }
CALL (free_inode) (me, ino); CALL (free_inode) (me, ino);
ifree (ino->linkname); g_free (ino->linkname);
if (ino->localname){ if (ino->localname){
unlink (ino->localname); unlink (ino->localname);
g_free(ino->localname); g_free(ino->localname);
@ -443,7 +443,7 @@ vfs_s_free_super (vfs *me, vfs_s_super *super)
} }
CALL (free_archive) (me, super); CALL (free_archive) (me, super);
ifree (super->name); g_free (super->name);
super->name = NULL; super->name = NULL;
g_free(super); g_free(super);
} }

10
vfs/fish.c
View File

@ -150,11 +150,11 @@ free_archive (vfs *me, vfs_s_super *super)
close(SUP.sockr); close(SUP.sockr);
SUP.sockw = SUP.sockr = -1; SUP.sockw = SUP.sockr = -1;
} }
ifree (SUP.host); g_free (SUP.host);
ifree (SUP.home); g_free (SUP.home);
ifree (SUP.user); g_free (SUP.user);
ifree (SUP.cwdir); g_free (SUP.cwdir);
ifree (SUP.password); g_free (SUP.password);
} }
static void static void

10
vfs/ftpfs.c
View File

@ -382,11 +382,11 @@ free_archive (vfs *me, vfs_s_super *super)
command(me, super, NONE, "QUIT"); command(me, super, NONE, "QUIT");
close(SUP.sock); close(SUP.sock);
} }
ifree (SUP.host); g_free (SUP.host);
ifree (SUP.home); g_free (SUP.home);
ifree (SUP.user); g_free (SUP.user);
ifree (SUP.cwdir); g_free (SUP.cwdir);
ifree (SUP.password); g_free (SUP.password);
} }
/* some defines only used by changetype */ /* some defines only used by changetype */

3
vfs/xdirentry.h
View File

@ -254,11 +254,8 @@ int vfs_s_get_line_interruptible (vfs *me, char *buffer, int size, int fd);
int vfs_s_retrieve_file (vfs *me, struct vfs_s_inode *ino); int vfs_s_retrieve_file (vfs *me, struct vfs_s_inode *ino);
#if 0 #if 0
/* If non-null, FREE */
#define ifree(ptr) do { if (ptr) g_free(ptr); } while (0)
#define ERRNOR(a, b) do { me->verrno = a; return b; } while (0) #define ERRNOR(a, b) do { me->verrno = a; return b; } while (0)
#else #else
#define ifree(ptr) { if (ptr) g_free(ptr); }
#define ERRNOR(a, b) { me->verrno = a; return b; } #define ERRNOR(a, b) { me->verrno = a; return b; }
#endif #endif