From da429d1fbacf853acf7fdcdfc3afbe4a1af85fbf Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 3 May 2020 01:16:17 +0100
Subject: [PATCH] Reformatting.

---
 setter/src/dos.c    | 33 ++++++++++++++++++++++-----------
 setter/src/dos.h    |  2 +-
 setter/src/os2_16.c | 10 +++++-----
 setter/src/os2_32.c | 32 ++++++++++++++++++++------------
 4 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/setter/src/dos.c b/setter/src/dos.c
index 750767b..092a5ab 100644
--- a/setter/src/dos.c
+++ b/setter/src/dos.c
@@ -31,13 +31,8 @@ Copyright (C) 2011-2020 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include "dos.h"
-
-#include "consts.h"
-#include "defs.h"
-#include "dosos2.h"
-
 #include <direct.h>
+#include <dos.h>
 #include <i86.h>
 #include <io.h>
 #include <malloc.h>
@@ -45,6 +40,12 @@ Copyright (C) 2011-2020 Natalia Portillo
 #include <stdlib.h>
 #include <string.h>
 
+#include "dos.h"
+
+#include "consts.h"
+#include "defs.h"
+#include "dosos2.h"
+
 void GetOsInfo()
 {
     union REGS    regs;
@@ -407,11 +408,17 @@ void FileAttributes(const char *path)
            cRc);
 }
 
-void FilePermissions(const char *path) { /* Do nothing, not supported by target operating system */ }
+void FilePermissions(const char *path)
+{ /* Do nothing, not supported by target operating system */
+}
 
-void ExtendedAttributes(const char *path) { /* Do nothing, not supported by target operating system */ }
+void ExtendedAttributes(const char *path)
+{ /* Do nothing, not supported by target operating system */
+}
 
-void ResourceFork(const char *path) { /* Do nothing, not supported by target operating system */ }
+void ResourceFork(const char *path)
+{ /* Do nothing, not supported by target operating system */
+}
 
 void Filenames(const char *path)
 {
@@ -1072,9 +1079,13 @@ void Fragmentation(const char *path, size_t clusterSize)
            cRc);
 }
 
-void Sparse(const char *path) { /* Do nothing, not supported by target operating system */ }
+void Sparse(const char *path)
+{ /* Do nothing, not supported by target operating system */
+}
 
-void Links(const char *path) { /* Do nothing, not supported by target operating system */ }
+void Links(const char *path)
+{ /* Do nothing, not supported by target operating system */
+}
 
 void MillionFiles(const char *path)
 {
diff --git a/setter/src/dos.h b/setter/src/dos.h
index 3236482..53f40b2 100644
--- a/setter/src/dos.h
+++ b/setter/src/dos.h
@@ -29,7 +29,7 @@ Contains DOS definitions
 Copyright (C) 2011-2020 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined (MSDOS)
+#if defined(__DOS__) || defined(MSDOS)
 
 #ifndef AARU_FSTESTER_SETTER_DOS_H
 #define AARU_FSTESTER_SETTER_DOS_H
diff --git a/setter/src/os2_16.c b/setter/src/os2_16.c
index cc8c7f3..65b732d 100644
--- a/setter/src/os2_16.c
+++ b/setter/src/os2_16.c
@@ -32,19 +32,19 @@ Copyright (C) 2011-2020 Natalia Portillo
 #if(defined(__I86__) || defined(__i86__) || defined(_M_I86)) && (defined(__OS2__) || defined(__os2__)) &&              \
     !defined(__DOS__)
 
+#define INCL_DOSMISC
+#define INCL_DOSFILEMGR
+
+#include <os2.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define INCL_DOSMISC
-#define INCL_DOSFILEMGR
+#include "os2_16.h"
 
 #include "consts.h"
 #include "defs.h"
 #include "dosos2.h"
-#include "os2_16.h"
-
-#include <os2.h>
 
 void GetOsInfo()
 {
diff --git a/setter/src/os2_32.c b/setter/src/os2_32.c
index d41f654..e79209d 100644
--- a/setter/src/os2_32.c
+++ b/setter/src/os2_32.c
@@ -29,23 +29,22 @@ Contains 32-bit OS/2 code
 Copyright (C) 2011-2020 Natalia Portillo
 *****************************************************************************/
 
-#if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_IX86)) &&                             \
+#if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_I386)) &&                             \
     (defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
+#include <os2.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "consts.h"
 #include "defs.h"
 #include "dosos2.h"
 #include "os2_16.h"
 
-#include <os2.h>
-
 void GetOsInfo()
 {
     ULONG  aulBuffer[3];
@@ -553,11 +552,17 @@ void FileAttributes(const char *path)
            cRc);
 }
 
-void FilePermissions(const char *path) { /* Do nothing, not supported by target operating system */ }
+void FilePermissions(const char *path)
+{ /* Do nothing, not supported by target operating system */
+}
 
-void ExtendedAttributes(const char *path) { /* TODO: Implement */ }
+void ExtendedAttributes(const char *path)
+{ /* TODO: Implement */
+}
 
-void ResourceFork(const char *path) { /* Do nothing, not supported by target operating system */ }
+void ResourceFork(const char *path)
+{ /* Do nothing, not supported by target operating system */
+}
 
 void Filenames(const char *path)
 {
@@ -1577,7 +1582,9 @@ void Fragmentation(const char *path, size_t clusterSize)
            cRc);
 }
 
-void Sparse(const char *path) { /* Do nothing, not supported by target operating system */ }
+void Sparse(const char *path)
+{ /* Do nothing, not supported by target operating system */
+}
 
 void Links(const char *path)
 {
@@ -1690,4 +1697,5 @@ void DeleteFiles(const char *path)
         DosDelete(&filename);
     }
 }
-#endif
\ No newline at end of file
+
+#endif