gunixmounts: Fix use of uninitialised variable

And drop a load of unused variables.

Fixes commit 5040cf19436851a7ad8f7231705d44a831cb3836.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
This commit is contained in:
Philip Withnall 2024-08-20 12:39:15 +01:00
parent fe5b9b41b7
commit 4235c11757
No known key found for this signature in database
GPG Key ID: DCDF5885B1F3ED73

View File

@ -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;