deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 10:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hpm: use portable __max() in hpmfwupg

Browse Source 
Instead of non-portable MAX() use __max() in hpmfwupg
This commit is contained in:
John Levon 2020-05-18 07:04:24 +01:00 committed by GitHub
parent c3939dac2c
commit 2a17967159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ipmi_hpmfwupg.c
View File

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2006 Kontron Canada, Inc. All Rights Reserved. * Copyright (c) 2006 Kontron Canada, Inc. All Rights Reserved.
* Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
* Copyright 2020 Joyent, Inc.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -1991,7 +1992,7 @@ HpmfwupgQueryRollbackStatus(struct ipmi_intf *intf,
rollbackTimeout = 0; rollbackTimeout = 0;
} }
/* Use the greater of the two timeouts (header and target caps) */ /* Use the greater of the two timeouts (header and target caps) */
rollbackTimeout = MAX(rollbackTimeout, rollbackTimeout = __max(rollbackTimeout,
pFwupgCtx->targetCap.rollbackTimeout) * 5; pFwupgCtx->targetCap.rollbackTimeout) * 5;
} else { } else {
rollbackTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT; rollbackTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
@ -2066,7 +2067,7 @@ HpmfwupgQuerySelftestResult(struct ipmi_intf *intf, struct HpmfwupgQuerySelftest
/* Getting selftest timeout from new image */ /* Getting selftest timeout from new image */
struct HpmfwupgImageHeader *pImageHeader = (struct HpmfwupgImageHeader*) struct HpmfwupgImageHeader *pImageHeader = (struct HpmfwupgImageHeader*)
pFwupgCtx->pImageData; pFwupgCtx->pImageData;
selfTestTimeout = MAX(pImageHeader->selfTestTimeout, selfTestTimeout = __max(pImageHeader->selfTestTimeout,
pFwupgCtx->targetCap.selftestTimeout) * 5; pFwupgCtx->targetCap.selftestTimeout) * 5;
} else { } else {
selfTestTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT; selfTestTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;