mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-24 19:22:11 +01:00
Merge branch 'unixmounts-fixes' into 'main'
gunixmounts: Fix use of uninitialised variable See merge request GNOME/glib!4197
This commit is contained in:
commit
255ffe09d4
@ -809,14 +809,13 @@ _g_unix_mounts_get_from_file (const char *table_path,
|
|||||||
{
|
{
|
||||||
struct mnttab mntent;
|
struct mnttab mntent;
|
||||||
FILE *file;
|
FILE *file;
|
||||||
const char *read_file;
|
|
||||||
GUnixMountEntry *mount_entry;
|
GUnixMountEntry *mount_entry;
|
||||||
GPtrArray *return_array = NULL;
|
GPtrArray *return_array = NULL;
|
||||||
|
|
||||||
if (time_read_out != NULL)
|
if (time_read_out != NULL)
|
||||||
*time_read_out = get_mounts_timestamp ();
|
*time_read_out = get_mounts_timestamp ();
|
||||||
|
|
||||||
file = setmntent (read_file, "re");
|
file = setmntent (table_path, "re");
|
||||||
if (file == NULL)
|
if (file == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
@ -1290,7 +1289,6 @@ _g_unix_mount_points_get_from_file (const char *table_path,
|
|||||||
#endif
|
#endif
|
||||||
struct mntent *mntent;
|
struct mntent *mntent;
|
||||||
FILE *file;
|
FILE *file;
|
||||||
char *read_file;
|
|
||||||
GUnixMountPoint *mount_point;
|
GUnixMountPoint *mount_point;
|
||||||
GPtrArray *return_array = NULL;
|
GPtrArray *return_array = NULL;
|
||||||
|
|
||||||
@ -1401,7 +1399,6 @@ _g_unix_mount_points_get_from_file (const char *table_path,
|
|||||||
{
|
{
|
||||||
struct mnttab mntent;
|
struct mnttab mntent;
|
||||||
FILE *file;
|
FILE *file;
|
||||||
char *read_file;
|
|
||||||
GUnixMountPoint *mount_point;
|
GUnixMountPoint *mount_point;
|
||||||
GPtrArray *return_array = NULL;
|
GPtrArray *return_array = NULL;
|
||||||
|
|
||||||
@ -1597,7 +1594,6 @@ _g_unix_mount_points_get_from_file (const char *table_path,
|
|||||||
{
|
{
|
||||||
struct mntent *mntent;
|
struct mntent *mntent;
|
||||||
FILE *file;
|
FILE *file;
|
||||||
char *read_file;
|
|
||||||
GUnixMountPoint *mount_point;
|
GUnixMountPoint *mount_point;
|
||||||
AixMountTableEntry mntent;
|
AixMountTableEntry mntent;
|
||||||
GPtrArray *return_array = NULL;
|
GPtrArray *return_array = NULL;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user