win32: reduce amount of static data

It appears that uninitialised static variables are placed in the
data section rather than bss, increasing the size of the binary.

Rewrite some code to reduce the amount of static data.

1 files changed, 26 insertions, 20 deletions

diff --git a/win32/mntent.c b/win32/mntent.c
index 9b04a9c5e..f9a2d26d4 100644
--- a/win32/mntent.c
+++ b/win32/mntent.c
@@ -7,6 +7,11 @@
 struct mntdata {
         DWORD flags;
         int index;
+        struct mntent me;
+        char mnt_fsname[4];
+        char mnt_dir[4];
+        char mnt_type[100];
+        char mnt_opts[4];
 };
 
 FILE *setmntent(const char *file UNUSED_PARAM, const char *mode UNUSED_PARAM)
@@ -26,34 +31,35 @@ FILE *setmntent(const char *file UNUSED_PARAM, const char *mode UNUSED_PARAM)
 struct mntent *getmntent(FILE *stream)
 {
         struct mntdata *data = (struct mntdata *)stream;
-        static char mnt_fsname[4];
-        static char mnt_dir[4];
-        static char mnt_type[100];
-        static char mnt_opts[4];
-        static struct mntent my_mount_entry =
-                                        { mnt_fsname, mnt_dir, mnt_type, mnt_opts, 0, 0 };
         struct mntent *entry;
 
+        data->me.mnt_fsname = data->mnt_fsname;
+        data->me.mnt_dir = data->mnt_dir;
+        data->me.mnt_type = data->mnt_type;
+        data->me.mnt_opts = data->mnt_opts;
+        data->me.mnt_freq = 0;
+        data->me.mnt_passno = 0;
+
         entry = NULL;
         while ( ++data->index < 26 ) {
                 if ( (data->flags & 1<<data->index) != 0 ) {
-                        mnt_fsname[0] = 'A' + data->index;
-                        mnt_fsname[1] = ':';
-                        mnt_fsname[2] = '\0';
-                        mnt_dir[0] = 'A' + data->index;
-                        mnt_dir[1] = ':';
-                        mnt_dir[2] = '\\';
-                        mnt_dir[3] = '\0';
-                        mnt_type[0] = '\0';
-                        mnt_opts[0] = '\0';
+                        data->mnt_fsname[0] = 'A' + data->index;
+                        data->mnt_fsname[1] = ':';
+                        data->mnt_fsname[2] = '\0';
+                        data->mnt_dir[0] = 'A' + data->index;
+                        data->mnt_dir[1] = ':';
+                        data->mnt_dir[2] = '\\';
+                        data->mnt_dir[3] = '\0';
+                        data->mnt_type[0] = '\0';
+                        data->mnt_opts[0] = '\0';
 
-                        if ( GetDriveType(mnt_dir) == DRIVE_FIXED ) {
-                                if ( !GetVolumeInformation(mnt_dir, NULL, 0, NULL, NULL,
-                                                                NULL, mnt_type, 100) ) {
-                                        mnt_type[0] = '\0';
+                        if ( GetDriveType(data->mnt_dir) == DRIVE_FIXED ) {
+                                if ( !GetVolumeInformation(data->mnt_dir, NULL, 0, NULL, NULL,
+                                                                NULL, data->mnt_type, 100) ) {
+                                        data->mnt_type[0] = '\0';
                                 }
 
-                                entry = &my_mount_entry;
+                                entry = &data->me;
                                 break;
                         }
                 }