Fix inclusion guards.

setter/src/dos/attr.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_DOS_ATTR_H_
-#define SETTER_SRC_DOS_ATTR_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_DOS_ATTR_H_
+#define AARU_FSTESTER_SETTER_SRC_DOS_ATTR_H_
 
 #include <dos.h>
 
@@ -106,4 +106,4 @@ static const dos_attr_tests_t dos_attrs[KNOWN_DOS_ATTRS] = {
      _A_ARCH | _A_SYSTEM | _A_HIDDEN | _A_RDONLY},
 };
 
-#endif // SETTER_SRC_DOS_ATTR_H_
+#endif // AARU_FSTESTER_SETTER_SRC_DOS_ATTR_H_

setter/src/dos/dos.h

@@ -24,8 +24,8 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#ifndef AARU_FSTESTER_SETTER_DOS_H
-#define AARU_FSTESTER_SETTER_DOS_H
+#ifndef AARU_FSTESTER_SETTER_SRC_DOS_H
+#define AARU_FSTESTER_SETTER_SRC_DOS_H
 
 #if defined(__WATCOM__)
 #include <direct.h>

setter/src/dos/time.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_DOS_TIME_H_
-#define SETTER_SRC_DOS_TIME_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_DOS_TIME_H_
+#define AARU_FSTESTER_SETTER_SRC_DOS_TIME_H_
 
 #include <dos.h>
 
@@ -65,4 +65,4 @@ static const dos_time_tests_t dos_times[KNOWN_DOS_TIMES] = {
     {"Y2KATIME",Y2K_DATE, MAX_TIME, WIN_SET_LAST_ACCESS_DATE_AND_TIME, "last access"},
 };
 
-#endif // SETTER_SRC_DOS_TIME_H_
+#endif // AARU_FSTESTER_SETTER_SRC_DOS_TIME_H_

setter/src/include/consts.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef AARU_FSTESTER_SETTER_CONSTS_H
-#define AARU_FSTESTER_SETTER_CONSTS_H
+#ifndef AARU_FSTESTER_SETTER_SRC_CONSTS_H
+#define AARU_FSTESTER_SETTER_SRC_CONSTS_H
 
 static const char* filenames[] = {
     "FILNAM",

setter/src/include/defs.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef AARU_FSTESTER_SETTER_DEFS_H
-#define AARU_FSTESTER_SETTER_DEFS_H
+#ifndef AARU_FSTESTER_SETTER_SRC_DEFS_H
+#define AARU_FSTESTER_SETTER_SRC_DEFS_H
 
 #include <stddef.h>
 

setter/src/linux/attr.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_LINUX_ATTR_H_
-#define SETTER_SRC_LINUX_ATTR_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_LINUX_ATTR_H_
+#define AARU_FSTESTER_SETTER_SRC_LINUX_ATTR_H_
 
 typedef struct
 {
@@ -97,4 +97,4 @@ static const linux_attr_tests_t linux_attrs[KNOWN_LINUX_ATTRS] = {
     {"UNREMOVABLE", "This file is now marked for undeletion", "File with undeletion flag", FS_UNRM_FL},
 };
 
-#endif // SETTER_SRC_LINUX_ATTR_H_
+#endif // AARU_FSTESTER_SETTER_SRC_LINUX_ATTR_H_

setter/src/linux/linux.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_LINUX_H
-#define SETTER_LINUX_H
+#ifndef AARU_FSTESTER_SETTER_LINUX_H
+#define AARU_FSTESTER_SETTER_LINUX_H
 
 void LinuxExtendedAttributes(const char* path);
 void LinuxSparse(const char* path);

setter/src/macos/attr.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_MACOS_ATTR_H_
-#define SETTER_SRC_MACOS_ATTR_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_MACOS_ATTR_H_
+#define AARU_FSTESTER_SETTER_SRC_MACOS_ATTR_H_
 
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
@@ -284,4 +284,4 @@ static const mac_attr_tests_t mac_attrs[KNOWN_MAC_ATTRS] = {"\pNONE",
                                                             ostUnknown,
                                                             {0, 0}};
 
-#endif // SETTER_SRC_MACOS_ATTR_H_
+#endif // AARU_FSTESTER_SETTER_SRC_MACOS_ATTR_H_

setter/src/macos/links.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_MACOS_LINKS_H_
-#define SETTER_SRC_MACOS_LINKS_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_MACOS_LINKS_H_
+#define AARU_FSTESTER_SETTER_SRC_MACOS_LINKS_H_
 
 #if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
 #include <Aliases.h>
@@ -36,4 +36,4 @@ static pascal OSErr CreateAliasFile(FSSpec* targetFile, FSSpec* aliasFile, OSTyp
 
 const char* targetText = "This file is the target of an alias.\r";
 
-#endif // SETTER_SRC_MACOS_LINKS_H_
+#endif // AARU_FSTESTER_SETTER_SRC_MACOS_LINKS_H_

setter/src/macos/macos.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef AARU_FSTESTER_SETTER_MACINTOSH_H
-#define AARU_FSTESTER_SETTER_MACINTOSH_H
+#ifndef AARU_FSTESTER_SETTER_SRC_MACOS_H
+#define AARU_FSTESTER_SETTER_SRC_MACOS_H
 
 #include <MacTypes.h>
 

setter/src/macos/retro68.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_MACOS_RETRO68_H_
-#define SETTER_SRC_MACOS_RETRO68_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_MACOS_RETRO68_H_
+#define AARU_FSTESTER_SETTER_SRC_MACOS_RETRO68_H_
 
 #define FOUR_CHAR_CODE(x) (x)
 
@@ -150,4 +150,4 @@ enum
     rAliasType = FOUR_CHAR_CODE('alis') /* Aliases are stored as resources of this type */
 };
 
-#endif // SETTER_SRC_MACOS_RETRO68_H_
+#endif // AARU_FSTESTER_SETTER_SRC_MACOS_RETRO68_H_

setter/src/macos/rsrcfork.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_MACOS_RSRCFORK_H_
-#define SETTER_SRC_MACOS_RSRCFORK_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_MACOS_RSRCFORK_H_
+#define AARU_FSTESTER_SETTER_SRC_MACOS_RSRCFORK_H_
 
 static OSErr SaveResourceToNewFile(int16_t        vRefNum,
                                    int32_t        dirID,
@@ -861,4 +861,4 @@ const unsigned char PictResource[9874] = {
     0xF1, 0xDE, 0x02, 0xE0, 0xE6, 0xCA, 0xFC, 0xCE, 0x03, 0xCC, 0xC3, 0xD9, 0xF3, 0xF2, 0xEF, 0x81, 0xFF, 0xEF, 0xFF,
     0x02, 0xF5, 0xF7, 0xF7, 0xFE, 0xF8, 0x01, 0xF6, 0xF3, 0xF0, 0xFF, 0x00, 0xFF};
 
-#endif // SETTER_SRC_MACOS_RSRCFORK_H_
+#endif // AARU_FSTESTER_SETTER_SRC_MACOS_RSRCFORK_H_

setter/src/macos/time.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_MACOS_TIME_H_
-#define SETTER_SRC_MACOS_TIME_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_MACOS_TIME_H_
+#define AARU_FSTESTER_SETTER_SRC_MACOS_TIME_H_
 
 #define DATETIME_FORMAT "This file is dated %s for %s\r"
 #define MAXDATETIME "2040/02/06 06:28:15"
@@ -67,4 +67,4 @@ static const mac_time_tests_t mac_times[KNOWN_MAC_TIMES] = {
     Y2KTIMESTAMP,   Y2KTIMESTAMP,   "all",        Y2KDATETIME,
 };
 
-#endif // SETTER_SRC_MACOS_TIME_H_
+#endif // AARU_FSTESTER_SETTER_SRC_MACOS_TIME_H_

setter/src/netware/netware.h

@@ -22,7 +22,7 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef AARU_FSTESTER_SETTER_NETWARE_H
-#define AARU_FSTESTER_SETTER_NETWARE_H
+#ifndef AARU_FSTESTER_SETTER_SRC_NETWARE_H
+#define AARU_FSTESTER_SETTER_SRC_NETWARE_H
 
 #endif

setter/src/os2/16bit/xattr.h

@@ -22,6 +22,9 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
+#ifndef AARU_FSTESTER_SETTER_SRC_OS2_32BIT_ATTR_H_
+#define AARU_FSTESTER_SETTER_SRC_OS2_32BIT_ATTR_H_
+
 unsigned char CommentsEA[72] = {
     0x45, 0x00, 0x00, 0x00, 0x00, 0x09, 0x33, 0x00, 0x2E, 0x43, 0x4F, 0x4D, 0x4D, 0x45, 0x4E, 0x54, 0x53, 0x00,
     0xFD, 0xFF, 0x2E, 0x00, 0x54, 0x68, 0x69, 0x73, 0x20, 0x45, 0x41, 0x20, 0x63, 0x6F, 0x6E, 0x74, 0x61, 0x69,
@@ -221,3 +224,5 @@ unsigned char IconEA[3516] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00};
+
+#endif // AARU_FSTESTER_SETTER_SRC_OS2_32BIT_ATTR_H_

setter/src/os2/attr.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_OS2_ATTR_H_
-#define SETTER_SRC_OS2_ATTR_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_OS2_ATTR_H_
+#define AARU_FSTESTER_SETTER_SRC_OS2_ATTR_H_
 
 #include <os2.h>
 
@@ -106,6 +106,6 @@ static const os2_attr_tests_t os2_attrs[KNOWN_OS2_ATTRS] = {
      FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN | FILE_READONLY},
 };
 
-#endif // SETTER_SRC_OS2_ATTR_H_
+#endif // AARU_FSTESTER_SETTER_SRC_OS2_ATTR_H_
 
 #endif

setter/src/os2/os2.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef AARU_FSTESTER_SETTER_OS2_H
-#define AARU_FSTESTER_SETTER_OS2_H
+#ifndef AARU_FSTESTER_SETTER_SRC_OS2_H
+#define AARU_FSTESTER_SETTER_SRC_OS2_H
 
 #include <os2.h>
 

setter/src/unix/perms.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_UNIX_PERMS_H_
-#define SETTER_SRC_UNIX_PERMS_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_UNIX_PERMS_H_
+#define AARU_FSTESTER_SETTER_SRC_UNIX_PERMS_H_
 
 typedef struct
 {
@@ -50,4 +50,4 @@ static const unix_perms_tests_t unix_perms[KNOWN_UNIX_PERMS] = {
     {"00001", "File with execute by others", 00001},
 };
 
-#endif // SETTER_SRC_UNIX_PERMS_H_
+#endif // AARU_FSTESTER_SETTER_SRC_UNIX_PERMS_H_

setter/src/unix/unix.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_UNIX_H
-#define SETTER_UNIX_H
+#ifndef AARU_FSTESTER_SETTER_UNIX_H
+#define AARU_FSTESTER_SETTER_UNIX_H
 
 #if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
 
@@ -409,4 +409,4 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #endif
 
-#endif // SETTER_UNIX_H
+#endif // AARU_FSTESTER_SETTER_UNIX_H

setter/src/win32/attr.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_WIN32_ATTR_H_
-#define SETTER_SRC_WIN32_ATTR_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_WIN32_ATTR_H_
+#define AARU_FSTESTER_SETTER_SRC_WIN32_ATTR_H_
 
 #include <windows.h>
 
@@ -402,4 +402,4 @@ BOOL(WINAPI* WinNtEncryptFileA)(LPCSTR);
 #define COMPRESSION_FORMAT_DEFAULT 1
 #endif
 
-#endif // SETTER_SRC_WIN32_ATTR_H_
+#endif // AARU_FSTESTER_SETTER_SRC_WIN32_ATTR_H_

setter/src/win32/links.h

@@ -22,12 +22,12 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_WIN32_LINKS_H_
-#define SETTER_SRC_WIN32_LINKS_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_WIN32_LINKS_H_
+#define AARU_FSTESTER_SETTER_SRC_WIN32_LINKS_H_
 
 #include "win32.h"
 
 static BOOL(WINAPI* WinNtCreateHardLinkA)(LPCSTR, LPCSTR, LPSECURITY_ATTRIBUTES);
 static BOOL(WINAPI* WinNtCreateSymbolicLinkA)(LPCSTR, LPCSTR, DWORD);
 
-#endif // SETTER_SRC_WIN32_LINKS_H_
+#endif // AARU_FSTESTER_SETTER_SRC_WIN32_LINKS_H_

setter/src/win32/os.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_WIN32_OS_H_
-#define SETTER_SRC_WIN32_OS_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_WIN32_OS_H_
+#define AARU_FSTESTER_SETTER_SRC_WIN32_OS_H_
 
 #include <windows.h>
 
@@ -41,4 +41,4 @@ Copyright (C) 2011-2021 Natalia Portillo
 #define VER_PLATFORM_WIN32_NT 2
 #endif
 
-#endif // SETTER_SRC_WIN32_OS_H_
+#endif // AARU_FSTESTER_SETTER_SRC_WIN32_OS_H_

setter/src/win32/rsrcfork.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_WIN32_RSRCFORK_H_
-#define SETTER_SRC_WIN32_RSRCFORK_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_WIN32_RSRCFORK_H_
+#define AARU_FSTESTER_SETTER_SRC_WIN32_RSRCFORK_H_
 
 const char* tinyAdsText         = "This is a tiny Alternate Data Stream.\n";
 const char* smallAdsText        = "This is a small Alternate Data Stream.\n";
@@ -33,4 +33,4 @@ const char* smallAdsRepeatText  = "This message repeats until almost 4KiB.\n";
 const char* mediumAdsRepeatText = "This message repeats until almost 64KiB.\n";
 const char* bigAdsRepeatText    = "This message repeats until more than 64KiB.\n";
 
-#endif // SETTER_SRC_WIN32_RSRCFORK_H_
+#endif // AARU_FSTESTER_SETTER_SRC_WIN32_RSRCFORK_H_

setter/src/win32/sparse.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_WIN32_SPARSE_H_
-#define SETTER_SRC_WIN32_SPARSE_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_WIN32_SPARSE_H_
+#define AARU_FSTESTER_SETTER_SRC_WIN32_SPARSE_H_
 
 #include <windows.h>
 
@@ -46,4 +46,4 @@ typedef struct _WINNT_FILE_ZERO_DATA_INFORMATION
     LARGE_INTEGER BeyondFinalZero;
 } WINNT_FILE_ZERO_DATA_INFORMATION, *PWINNT_FILE_ZERO_DATA_INFORMATION;
 
-#endif // SETTER_SRC_WIN32_SPARSE_H_
+#endif // AARU_FSTESTER_SETTER_SRC_WIN32_SPARSE_H_

setter/src/win32/time.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_WIN32_TIME_H_
-#define SETTER_SRC_WIN32_TIME_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_WIN32_TIME_H_
+#define AARU_FSTESTER_SETTER_SRC_WIN32_TIME_H_
 
 #include <windows.h>
 
@@ -65,4 +65,4 @@ static const win32_time_tests_t win32_timestamps[KNOWN_WIN32_TIMESTAMPS] = {
     {"Y2KMTIME", {0, 0}, {0, 0}, {Y2KTIMESTAMP_LO, TIMESTAMP_HI}, "modification", Y2KDATETIME},
 };
 
-#endif // SETTER_SRC_WIN32_TIME_H_
+#endif // AARU_FSTESTER_SETTER_SRC_WIN32_TIME_H_

setter/src/win32/volume.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_WIN32_VOLUME_H_
-#define SETTER_SRC_WIN32_VOLUME_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_WIN32_VOLUME_H_
+#define AARU_FSTESTER_SETTER_SRC_WIN32_VOLUME_H_
 
 #include <windows.h>
 
@@ -159,4 +159,4 @@ BOOL(WINAPI* WinGetDiskFreeSpaceExA)(LPCSTR, PULARGE_INTEGER, PULARGE_INTEGER, P
 #define FS_LFN_APIS 0x00004000
 #endif
 
-#endif // SETTER_SRC_WIN32_VOLUME_H_
+#endif // AARU_FSTESTER_SETTER_SRC_WIN32_VOLUME_H_

setter/src/win32/win32.h

@@ -25,8 +25,8 @@ Copyright (C) 2011-2021 Natalia Portillo
 #pragma clang diagnostic push
 #pragma ide diagnostic ignored "bugprone-reserved-identifier"
 
-#ifndef AARU_FSTESTER_SETTER_WIN32_H
-#define AARU_FSTESTER_SETTER_WIN32_H
+#ifndef AARU_FSTESTER_SETTER_SRC_WIN32_H
+#define AARU_FSTESTER_SETTER_SRC_WIN32_H
 
 #include <windows.h>
 

setter/src/win32/xattr.h

@@ -22,8 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#ifndef SETTER_SRC_WIN32_XATTR_H_
-#define SETTER_SRC_WIN32_XATTR_H_
+#ifndef AARU_FSTESTER_SETTER_SRC_WIN32_XATTR_H_
+#define AARU_FSTESTER_SETTER_SRC_WIN32_XATTR_H_
 
 unsigned char CommentsEA[72] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x33, 0x00, 0x2E, 0x43, 0x4F, 0x4D, 0x4D, 0x45, 0x4E, 0x54, 0x53, 0x00,
@@ -247,4 +247,4 @@ typedef struct _FILE_FULL_EA_INFORMATION
 static NTSTATUS(NTAPI* NtSetEaFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG);
 static NTSTATUS(NTAPI* NtQueryEaFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, BOOLEAN, PVOID, ULONG, PULONG, BOOLEAN);
 
-#endif // SETTER_SRC_WIN32_XATTR_H_
+#endif // AARU_FSTESTER_SETTER_SRC_WIN32_XATTR_H_