aaru-dps/libaaruformat
1
0
Fork 0
mirror of https://github.com/aaru-dps/libaaruformat.git synced 2025-12-16 19:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename structures.

Browse Source
This commit is contained in:
Natalia Portillo
2020-03-01 19:55:22 +00:00
parent 5105a6f4e7
commit a03a177f44
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/aaru.h
View File

@@ -1095,7 +1095,7 @@ typedef enum
CdSectorEccP = 5, /** CD sector ECC P, 172 bytes */
CdSectorEccQ = 6, /** CD sector ECC Q, 104 bytes */
CdSectorEcc = 7, /** CD sector ECC (P and Q), 276 bytes */
CdSectorSubchannelDic = 8, /** CD sector subchannel, 96 bytes */
CdSectorSubchannelAaru = 8, /** CD sector subchannel, 96 bytes */
CdTrackIsrc = 9, /** CD track ISRC, string, 12 bytes */
CdTrackText = 10, /** CD track text, string, 13 bytes */
CdTrackFlags = 11, /** CD track flags, 1 byte */

2
include/aaruformat/context.h
View File

@@ -44,7 +44,7 @@ typedef struct aaruformatContext
uint8_t libraryMajorVersion;
uint8_t libraryMinorVersion;
FILE* imageStream;
DicHeader header;
AaruHeader header;
struct dataLinkedList* mediaTagsHead;
struct dataLinkedList* mediaTagsTail;
uint8_t* sectorPrefix;

2
include/aaruformat/enums.h
View File

@@ -242,7 +242,7 @@ typedef enum
typedef enum
{
AARUF_STATUS_INVALID_CONTEXT = -1,
} DicformatStatus;
} AaruformatStatus;
/**
* Enumeration of media types defined in CICM metadata

4
include/aaruformat/structs.h
View File

@@ -44,7 +44,7 @@
#include <stdint.h>
/**Header, at start of file */
typedef struct DicHeader
typedef struct AaruHeader
{
/**Header identifier, <see cref="AARU_MAGIC" /> */
uint64_t identifier;
@@ -66,7 +66,7 @@ typedef struct DicHeader
int64_t creationTime;
/**Windows filetime (100 nanoseconds since 1601/01/01 00:00:00 UTC) of image last written time */
int64_t lastWrittenTime;
} DicHeader;
} AaruHeader;
/**Header for a deduplication table. Table follows it */
typedef struct DdtHeader

6
src/identify.c
View File

@@ -67,11 +67,11 @@ int identifyStream(FILE* imageStream)
{
fseek(imageStream, 0, SEEK_SET);
DicHeader header;
AaruHeader header;
size_t ret = fread(&header, sizeof(DicHeader), 1, imageStream);
size_t ret = fread(&header, sizeof(AaruHeader), 1, imageStream);
if(ret < sizeof(DicHeader)) return 0;
if(ret < sizeof(AaruHeader)) return 0;
if(header.identifier == DIC_MAGIC && header.imageMajorVersion <= AARUF_VERSION) return 100;

4
src/open.c
View File

@@ -70,9 +70,9 @@ void* open(const char* filepath)
}
fseek(ctx->imageStream, 0, SEEK_SET);
readBytes = fread(&ctx->header, sizeof(DicHeader), 1, ctx->imageStream);
readBytes = fread(&ctx->header, sizeof(AaruHeader), 1, ctx->imageStream);
if(readBytes != sizeof(DicHeader))
if(readBytes != sizeof(AaruHeader))
{
free(ctx);
errno = AARUF_ERROR_FILE_TOO_SMALL;