From 70f7ccd29a249bd815af882150d2f4c9300e42a9 Mon Sep 17 00:00:00 2001 From: _ <_> Date: Thu, 19 Apr 2018 05:19:02 -0700 Subject: [PATCH] Addressed warnings for pld module --- include/devil1pld.h | 14 +++++--------- src/devil1pld.c | 8 +++++++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/devil1pld.h b/include/devil1pld.h index ef6abac..6057cd1 100644 --- a/include/devil1pld.h +++ b/include/devil1pld.h @@ -14,23 +14,19 @@ 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*); -} fn_devil1pld; -extern fn_devil1pld 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*); + bool (* const getheader) (struct PldHeader*, const char*); // input: pointer to header, index of offset, filesize // * = pass by reference of a struct PldHeader -static int sizeofpldstruct(struct PldHeader*, unsigned int, unsigned int); + int (* const sizeofsector)(struct PldHeader*, unsigned int, unsigned int); // input: a pld header struct. // * = pass by reference of a struct PldHeader -static void printpldh(struct PldHeader*); + void (* const printheader) (struct PldHeader*); +} fn_devil1pld; +extern fn_devil1pld const DEVIL1PLD; #endif diff --git a/src/devil1pld.c b/src/devil1pld.c index 3e3d96f..7717d98 100644 --- a/src/devil1pld.c +++ b/src/devil1pld.c @@ -1,6 +1,12 @@ #include "devil1pld.h" #include +static bool getpldh(struct PldHeader*, const char*); + +static int sizeofpldstruct(struct PldHeader*, unsigned int, unsigned int); + +static void printpldh(struct PldHeader*); + fn_devil1pld const DEVIL1PLD = {getpldh, sizeofpldstruct, printpldh}; static bool getpldh(struct PldHeader *ph, const char *filedata) { @@ -36,7 +42,7 @@ static void printpldh(struct PldHeader *ph) { return; } printf("number of offsets = %i\n", ph -> numOffset); - printf("offsets = %x\n", ph -> offsets); + printf("offsets = %p\n", ph -> offsets); unsigned int i; for (i = 0; i < ph -> numOffset; i++) { printf("offset %i = %x\n", i, ph -> offsets[i]);