diff --git a/include/devil1pld.h b/include/devil1pld.h index f79e496..5de204f 100644 --- a/include/devil1pld.h +++ b/include/devil1pld.h @@ -13,6 +13,13 @@ struct PldHeader { #pragma pack(pop) +typedef struct { + bool (* const getheader) (struct PldHeader*, const char*); + int (* const sizeofsector)(struct PldHeader*, unsigned int, unsigned int); + void (* const printheader) (struct PldHeader*); +} namespace_struct; +extern namespace_struct const DEVIL1PLD; + // input: pointer to a struct, contents of the .pld file. // * = pass by reference of a struct PldHeader static bool getpldh(struct PldHeader*, const char*); @@ -25,11 +32,5 @@ static int sizeofpldstruct(struct PldHeader*, unsigned int, unsigned int); // * = pass by reference of a struct PldHeader static void printpldh(struct PldHeader*); -typedef struct { - bool (* const getheader) (struct PldHeader*, const char*); - int (* const sizeofsector)(struct PldHeader*, unsigned int, unsigned int); - void (* const printheader) (struct PldHeader*); -} namespace_struct; -extern namespace_struct const DEVIL1PLD; #endif diff --git a/src/devil1pld.c b/src/devil1pld.c index 148e323..d29aafe 100644 --- a/src/devil1pld.c +++ b/src/devil1pld.c @@ -1,6 +1,8 @@ #include "devil1pld.h" #include +namespace_struct const DEVIL1PLD = {getpldh, sizeofpldstruct, printpldh}; + static bool getpldh(struct PldHeader *ph, const char *filedata) { bool good = false; if (ph != NULL && filedata != NULL) { @@ -40,5 +42,3 @@ static void printpldh(struct PldHeader *ph) { printf("offset %i = %x\n", i, ph -> offsets[i]); } } - -namespace_struct const DEVIL1PLD = {getpldh, sizeofpldstruct, printpldh};