Rename macros.

include/aaru.h

@@ -37,9 +37,9 @@
 // ****************************************************************************/
 
 #pragma clang diagnostic push
-#pragma ide diagnostic ignored "OCUnusedGlobalDeclarationInspection"
-#ifndef LIBDICFORMAT_DIC_H
-#define LIBDICFORMAT_DIC_H
+#pragma ide diagnostic   ignored "OCUnusedGlobalDeclarationInspection"
+#ifndef LIBAARUFORMAT_AARU_H
+#define LIBAARUFORMAT_AARU_H
 
 #include <stdint.h>
 
@@ -1184,6 +1184,6 @@ typedef enum
     CD_LeadIn           = 68
 } MediaTagType;
 
-#endif // LIBDICFORMAT_DIC_H
+#endif // LIBAARUFORMAT_AARU_H
 
 #pragma clang diagnostic pop

include/aaruformat.h

@@ -30,11 +30,11 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-#ifndef LIBDICFORMAT_DICFORMAT_H
-#define LIBDICFORMAT_DICFORMAT_H
+#ifndef LIBAARUFORMAT_AARUFORMAT_H
+#define LIBAARUFORMAT_AARUFORMAT_H
 
-#define LIBDICFORMAT_MAJOR_VERSION 1
-#define LIBDICFORMAT_MINOR_VERSION 0
+#define LIBAARUFORMAT_MAJOR_VERSION 1
+#define LIBAARUFORMAT_MINOR_VERSION 0
 
 #include "aaruformat/consts.h"
 #include "aaruformat/context.h"
@@ -43,4 +43,4 @@
 #include "aaruformat/errors.h"
 #include "aaruformat/structs.h"
 
-#endif // LIBDICFORMAT_DICFORMAT_H
+#endif // LIBAARUFORMAT_AARUFORMAT_H

include/aaruformat/consts.h

@@ -31,15 +31,15 @@
 // ****************************************************************************/
 
 #pragma clang diagnostic push
-#pragma ide diagnostic ignored "OCUnusedMacroInspection"
-#ifndef LIBDICFORMAT_CONSTS_H
-#define LIBDICFORMAT_CONSTS_H
+#pragma ide diagnostic   ignored "OCUnusedMacroInspection"
+#ifndef LIBAARUFORMAT_CONSTS_H
+#define LIBAARUFORMAT_CONSTS_H
 
 /** Magic identidier = "DICMFMT". */
 #define DIC_MAGIC 0x544D52464D434944
 /** Image format version. A change in this number indicates an incompatible change to the format that prevents older
  * implementations from reading it correctly, if at all. */
-#define DICF_VERSION 1
+#define AARUF_VERSION 1
 /** Maximum read cache size, 256MiB. */
 #define MAX_CACHE_SIZE 256 * 1024 * 1024
 /** Size in bytes of LZMA properties. */
@@ -60,6 +60,6 @@
 #define CRC64_ECMA_POLY 0xC96C5795D7870F42
 #define CRC64_ECMA_SEED 0xFFFFFFFFFFFFFFFF
 
-#endif // LIBDICFORMAT_CONSTS_H
+#endif // LIBAARUFORMAT_CONSTS_H
 
 #pragma clang diagnostic pop

include/aaruformat/context.h

@@ -29,8 +29,8 @@
 // ----------------------------------------------------------------------------
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
-#ifndef LIBDICFORMAT_CONTEXT_H
-#define LIBDICFORMAT_CONTEXT_H
+#ifndef LIBAARUFORMAT_CONTEXT_H
+#define LIBAARUFORMAT_CONTEXT_H
 
 #include "structs.h"
 
@@ -108,4 +108,4 @@ typedef struct DumpExtent
 
 #pragma pack(pop)
 
-#endif // LIBDICFORMAT_CONTEXT_H
+#endif // LIBAARUFORMAT_CONTEXT_H

include/aaruformat/decls.h

@@ -30,8 +30,8 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-#ifndef LIBDICFORMAT_DECLS_H
-#define LIBDICFORMAT_DECLS_H
+#ifndef LIBAARUFORMAT_DECLS_H
+#define LIBAARUFORMAT_DECLS_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -117,4 +117,4 @@ int32_t GetMediaTagTypeForDataType(int32_t type);
 
 int32_t GetXmlMediaType(int32_t type);
 
-#endif // LIBDICFORMAT_DECLS_H
+#endif // LIBAARUFORMAT_DECLS_H

include/aaruformat/enums.h

@@ -1,7 +1,7 @@
 #pragma clang diagnostic push
-#pragma ide diagnostic ignored "OCUnusedGlobalDeclarationInspection"
-#ifndef LIBDICFORMAT_ENUMS_H
-#define LIBDICFORMAT_ENUMS_H
+#pragma ide diagnostic   ignored "OCUnusedGlobalDeclarationInspection"
+#ifndef LIBAARUFORMAT_ENUMS_H
+#define LIBAARUFORMAT_ENUMS_H
 
 /** List of known compression types */
 typedef enum
@@ -241,7 +241,7 @@ typedef enum
 
 typedef enum
 {
-    DICF_STATUS_INVALID_CONTEXT = -1,
+    AARUF_STATUS_INVALID_CONTEXT = -1,
 } DicformatStatus;
 
 /**
@@ -265,6 +265,6 @@ typedef enum
     AudioMedia = 3
 } XmlMediaType;
 
-#endif // LIBDICFORMAT_ENUMS_H
+#endif // LIBAARUFORMAT_ENUMS_H
 
 #pragma clang diagnostic pop

include/aaruformat/errors.h

@@ -2,29 +2,29 @@
 // Created by claunia on 17/03/19.
 //
 
-#ifndef LIBDICFORMAT_ERRORS_H
-#define LIBDICFORMAT_ERRORS_H
+#ifndef LIBAARUFORMAT_ERRORS_H
+#define LIBAARUFORMAT_ERRORS_H
 
-#define DICF_ERROR_NOT_DICFORMAT -1
-#define DICF_ERROR_FILE_TOO_SMALL -2
-#define DICF_ERROR_INCOMPATIBLE_VERSION -3
-#define DICF_ERROR_CANNOT_READ_INDEX -4
-#define DICF_ERROR_SECTOR_OUT_OF_BOUNDS -5
-#define DICF_ERROR_CANNOT_READ_HEADER -6
-#define DICF_ERROR_CANNOT_READ_BLOCK -7
-#define DICF_ERROR_UNSUPPORTED_COMPRESSION -8
-#define DICF_ERROR_NOT_ENOUGH_MEMORY -9
-#define DICF_ERROR_BUFFER_TOO_SMALL -10
-#define DICF_ERROR_MEDIA_TAG_NOT_PRESENT -11
-#define DICF_ERROR_INCORRECT_MEDIA_TYPE -12
-#define DICF_ERROR_TRACK_NOT_FOUND -13
-#define DICF_ERROR_REACHED_UNREACHABLE_CODE -14
-#define DICF_ERROR_INVALID_TRACK_FORMAT -15
-#define DICF_ERROR_SECTOR_TAG_NOT_PRESENT -11
+#define AARUF_ERROR_NOT_AARUFORMAT -1
+#define AARUF_ERROR_FILE_TOO_SMALL -2
+#define AARUF_ERROR_INCOMPATIBLE_VERSION -3
+#define AARUF_ERROR_CANNOT_READ_INDEX -4
+#define AARUF_ERROR_SECTOR_OUT_OF_BOUNDS -5
+#define AARUF_ERROR_CANNOT_READ_HEADER -6
+#define AARUF_ERROR_CANNOT_READ_BLOCK -7
+#define AARUF_ERROR_UNSUPPORTED_COMPRESSION -8
+#define AARUF_ERROR_NOT_ENOUGH_MEMORY -9
+#define AARUF_ERROR_BUFFER_TOO_SMALL -10
+#define AARUF_ERROR_MEDIA_TAG_NOT_PRESENT -11
+#define AARUF_ERROR_INCORRECT_MEDIA_TYPE -12
+#define AARUF_ERROR_TRACK_NOT_FOUND -13
+#define AARUF_ERROR_REACHED_UNREACHABLE_CODE -14
+#define AARUF_ERROR_INVALID_TRACK_FORMAT -15
+#define AARUF_ERROR_SECTOR_TAG_NOT_PRESENT -11
 
-#define DICF_STATUS_OK 0
-#define DICF_STATUS_SECTOR_NOT_DUMPED 1
-#define DICF_STATUS_SECTOR_WITH_ERRORS 2
-#define DICF_STATUS_SECTOR_DELETED 3
+#define AARUF_STATUS_OK 0
+#define AARUF_STATUS_SECTOR_NOT_DUMPED 1
+#define AARUF_STATUS_SECTOR_WITH_ERRORS 2
+#define AARUF_STATUS_SECTOR_DELETED 3
 
-#endif // LIBDICFORMAT_ERRORS_H
+#endif // LIBAARUFORMAT_ERRORS_H

include/aaruformat/structs.h

@@ -31,9 +31,9 @@
 // ****************************************************************************/
 
 #pragma clang diagnostic push
-#pragma ide diagnostic ignored "OCUnusedGlobalDeclarationInspection"
-#ifndef LIBDICFORMAT_STRUCTS_H
-#define LIBDICFORMAT_STRUCTS_H
+#pragma ide diagnostic   ignored "OCUnusedGlobalDeclarationInspection"
+#ifndef LIBAARUFORMAT_STRUCTS_H
+#define LIBAARUFORMAT_STRUCTS_H
 
 #pragma pack(push, 1)
 
@@ -46,7 +46,7 @@
 /**Header, at start of file */
 typedef struct DicHeader
 {
-    /**Header identifier, <see cref="DIC_MAGIC" /> */
+    /**Header identifier, <see cref="AARU_MAGIC" /> */
     uint64_t identifier;
     /**UTF-16LE name of the application that created the image */
     uint8_t application[64];
@@ -321,6 +321,6 @@ typedef struct CdEccContext
 
 #pragma pack(pop)
 
-#endif // LIBDICFORMAT_STRUCTS_H
+#endif // LIBAARUFORMAT_STRUCTS_H
 
 #pragma clang diagnostic pop