* vfs.c (vfs_cmp_handle): Fixing warnings on on 64-bit
platforms. (vfs_op):Likewise. (vfs_info):Likewise. (vfs_free_handle):Likewise. * extfs/rpm (mcrpmfs_run): Quote parameters to calls to system/open that spawn a shell. * direntry.c (vfs_s_find_entry_tree): Make "size" size_t.
Этот коммит содержится в:
родитель
d448a65825
Коммит
c9f834b501
@ -1,3 +1,17 @@
|
|||||||
|
2004-09-04 Pavel S. Shirshov <pavelsh@mail.ru>
|
||||||
|
|
||||||
|
* vfs.c (vfs_cmp_handle): Fixing warnings on on 64-bit
|
||||||
|
platforms.
|
||||||
|
(vfs_op):Likewise.
|
||||||
|
(vfs_info):Likewise.
|
||||||
|
(vfs_free_handle):Likewise.
|
||||||
|
* extfs/rpm (mcrpmfs_run): Quote parameters to calls
|
||||||
|
to system/open that spawn a shell.
|
||||||
|
* direntry.c (vfs_s_find_entry_tree): Make "size"
|
||||||
|
size_t.
|
||||||
|
|
||||||
|
Based on patches from Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
2004-09-02 Andrew V. Samoilov <sav@bcs.zp.ua>
|
2004-09-02 Andrew V. Samoilov <sav@bcs.zp.ua>
|
||||||
|
|
||||||
* tar.c (tar_read_header): Fix missed *.
|
* tar.c (tar_read_header): Fix missed *.
|
||||||
|
@ -240,7 +240,7 @@ static struct vfs_s_entry *
|
|||||||
vfs_s_find_entry_tree (struct vfs_class *me, struct vfs_s_inode *root,
|
vfs_s_find_entry_tree (struct vfs_class *me, struct vfs_s_inode *root,
|
||||||
char *path, int follow, int flags)
|
char *path, int follow, int flags)
|
||||||
{
|
{
|
||||||
unsigned int pseg;
|
size_t pseg;
|
||||||
struct vfs_s_entry *ent = NULL;
|
struct vfs_s_entry *ent = NULL;
|
||||||
|
|
||||||
canonicalize_pathname (path);
|
canonicalize_pathname (path);
|
||||||
|
@ -177,8 +177,8 @@ mcrpmfs_run ()
|
|||||||
{
|
{
|
||||||
f="`echo "$1" | $SED "$SEDCMD"`"
|
f="`echo "$1" | $SED "$SEDCMD"`"
|
||||||
case "$2" in
|
case "$2" in
|
||||||
INSTALL) echo "Installing \"\"$f\"\""; $RPM -ivh "$1"; exit 0;;
|
INSTALL) echo "Installing \"\"$f\"\""; $RPM -ivh "$f"; exit 0;;
|
||||||
UPGRADE) echo "Upgrading \"\"$f\"\""; $RPM -Uvh "$1"; exit 0;;
|
UPGRADE) echo "Upgrading \"\"$f\"\""; $RPM -Uvh "$f"; exit 0;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ vfs_cmp_handle (gconstpointer a, gconstpointer b)
|
|||||||
{
|
{
|
||||||
if (!a)
|
if (!a)
|
||||||
return 1;
|
return 1;
|
||||||
return ((struct vfs_openfile *) a)->handle != (int) b;
|
return ((struct vfs_openfile *) a)->handle != (long) b;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Find VFS class by file handle */
|
/* Find VFS class by file handle */
|
||||||
@ -95,7 +95,7 @@ vfs_op (int handle)
|
|||||||
GSList *l;
|
GSList *l;
|
||||||
struct vfs_openfile *h;
|
struct vfs_openfile *h;
|
||||||
|
|
||||||
l = g_slist_find_custom (vfs_openfiles, (void *) handle,
|
l = g_slist_find_custom (vfs_openfiles, (void *) (long) handle,
|
||||||
vfs_cmp_handle);
|
vfs_cmp_handle);
|
||||||
if (!l)
|
if (!l)
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -112,7 +112,7 @@ vfs_info (int handle)
|
|||||||
GSList *l;
|
GSList *l;
|
||||||
struct vfs_openfile *h;
|
struct vfs_openfile *h;
|
||||||
|
|
||||||
l = g_slist_find_custom (vfs_openfiles, (void *) handle,
|
l = g_slist_find_custom (vfs_openfiles, (void *) (long) handle,
|
||||||
vfs_cmp_handle);
|
vfs_cmp_handle);
|
||||||
if (!l)
|
if (!l)
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -128,7 +128,7 @@ vfs_free_handle (int handle)
|
|||||||
{
|
{
|
||||||
GSList *l;
|
GSList *l;
|
||||||
|
|
||||||
l = g_slist_find_custom (vfs_openfiles, (void *) handle,
|
l = g_slist_find_custom (vfs_openfiles, (void *) (long) handle,
|
||||||
vfs_cmp_handle);
|
vfs_cmp_handle);
|
||||||
vfs_openfiles = g_slist_delete_link (vfs_openfiles, l);
|
vfs_openfiles = g_slist_delete_link (vfs_openfiles, l);
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user