deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2026-06-29 16:51:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring: optimize pointer checks

Browse Source 
Remove all direct comparisons to 'NULL' for pointers.
Replace them with boolean-like 'if (ptr)' and 'if (!ptr)'.
This makes conditions shorter and easier to read.

Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
This commit is contained in:
Alexander Amelkin
2018-08-21 17:16:19 +03:00
parent f3ef88724f
commit e9716e216d
48 changed files with 1050 additions and 1090 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/ipmi_oem.c
View File

@@ -91,8 +91,8 @@ ipmi_oem_supermicro(struct ipmi_intf * intf)
static int
ipmi_oem_ibm(struct ipmi_intf * intf)
{
char * filename;
if ((filename = getenv("IPMI_OEM_IBM_DATAFILE")) == NULL) {
char * filename = getenv("IPMI_OEM_IBM_DATAFILE");
if (!filename) {
lprintf(LOG_ERR, "Unable to read IPMI_OEM_IBM_DATAFILE from environment");
return -1;
}
@@ -114,7 +114,7 @@ ipmi_oem_print(void)
{
struct ipmi_oem_handle * oem;
lprintf(LOG_NOTICE, "\nOEM Support:");
for (oem=ipmi_oem_list; oem->name != NULL && oem->desc != NULL; oem++) {
for (oem=ipmi_oem_list; oem->name && oem->desc; oem++) {
lprintf(LOG_NOTICE, "\t%-12s %s", oem->name, oem->desc);
}
lprintf(LOG_NOTICE, "");
@@ -134,26 +134,27 @@ ipmi_oem_setup(struct ipmi_intf * intf, char * oemtype)
struct ipmi_oem_handle * oem;
int rc = 0;
if (oemtype == NULL ||
strncmp(oemtype, "help", 4) == 0 ||
strncmp(oemtype, "list", 4) == 0) {
if (!oemtype
|| strncmp(oemtype, "help", 4) == 0
|| strncmp(oemtype, "list", 4) == 0)
{
ipmi_oem_print();
return -1;
}
for (oem=ipmi_oem_list; oem->name != NULL; oem++) {
for (oem=ipmi_oem_list; oem->name; oem++) {
if (strncmp(oemtype, oem->name, strlen(oem->name)) == 0)
break;
}
if (oem->name == NULL)
if (!oem->name)
return -1;
/* save pointer for later use */
intf->oem = oem;
/* run optional setup function if it is defined */
if (oem->setup != NULL) {
if (oem->setup) {
lprintf(LOG_DEBUG, "Running OEM setup for \"%s\"", oem->desc);
rc = oem->setup(intf);
}
@@ -172,7 +173,7 @@ ipmi_oem_setup(struct ipmi_intf * intf, char * oemtype)
int
ipmi_oem_active(struct ipmi_intf * intf, const char * oemtype)
{
if (intf->oem == NULL)
if (!intf->oem)
return 0;
if (strncmp(intf->oem->name, oemtype, strlen(oemtype)) == 0)