diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2025-03-16 13:34:00 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2025-03-16 13:34:00 +0100 |
| commit | 0bbe5815fd94129767ec0072d1d7e5e7eff1a6e7 (patch) | |
| tree | 1b44e7d6fd8446f8c3e2fc8f1ef3af281d590fab /util/oem_dell.c | |
| parent | 9641459c047738b492ab6002a9d38d286e237721 (diff) | |
| parent | 5ad8be875662e799ca8739e267b4879bb281a048 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'util/oem_dell.c')
| -rw-r--r-- | util/oem_dell.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/util/oem_dell.c b/util/oem_dell.c index b474ee3..ae7a3d1 100644 --- a/util/oem_dell.c +++ b/util/oem_dell.c @@ -4,6 +4,7 @@ * * Change history: * 08/17/2011 ARCress - included in ipmiutil source tree + * 09/18/2024 ARCress - fix macos compile error with vFlashstr typedef * */ /****************************************************************** @@ -157,8 +158,14 @@ static uint8_t SetLEDSupported=0; volatile uint8_t IMC_Type = IMC_IDRAC_10G; +typedef struct +{ + int val; + char *str; +} vFlashstr; -const struct vFlashstr vFlash_completion_code_vals[] = { +// const struct vFlashstr vFlash_completion_code_vals[] = { +const vFlashstr vFlash_completion_code_vals[] = { {0x00, "SUCCESS"}, {0x01, "NO_SD_CARD"}, {0x63, "UNKNOWN_ERROR"}, @@ -250,7 +257,8 @@ static void ipmi_powermonitor_usage(void); /* vFlash Function prototypes */ static int ipmi_delloem_vFlash_main(void * intf, int argc, char ** argv); -const char * get_vFlash_compcode_str(uint8_t vflashcompcode, const struct vFlashstr *vs); +// const char * get_vFlash_compcode_str(uint8_t vflashcompcode, const struct vFlashstr *vs); +const char * get_vFlash_compcode_str(uint8_t vflashcompcode, const vFlashstr *vs); static int ipmi_get_sd_card_info(void* intf); static int ipmi_delloem_vFlash_process(void* intf, int current_arg, char ** argv); static void ipmi_vFlash_usage(void); @@ -4818,7 +4826,8 @@ static int ipmi_delloem_vFlash_main (void * intf, int argc, char ** argv) * ******************************************************************/ const char * -get_vFlash_compcode_str(uint8_t vflashcompcode, const struct vFlashstr *vs) +// get_vFlash_compcode_str(uint8_t vflashcompcode, const struct vFlashstr *vs) +get_vFlash_compcode_str(uint8_t vflashcompcode, const vFlashstr *vs) { static char un_str[32]; int i; |