From a9ee361f27e0439530387765924574e5358c8a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sat, 10 Sep 2022 15:44:41 +0200
Subject: New upstream version 1.8.19

---
 lib/ipmi_sdradd.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'lib/ipmi_sdradd.c')

diff --git a/lib/ipmi_sdradd.c b/lib/ipmi_sdradd.c
index 52848a3..87063bb 100644
--- a/lib/ipmi_sdradd.c
+++ b/lib/ipmi_sdradd.c
@@ -80,7 +80,7 @@ partial_send(struct ipmi_intf *intf, struct ipmi_rq *req, uint16_t *id)
 {
   struct ipmi_rs *rsp;
   rsp = intf->sendrecv(intf, req);
-  if (rsp == NULL) {
+  if (!rsp) {
     return -1;
   }
 
@@ -115,7 +115,7 @@ ipmi_sdr_add_record(struct ipmi_intf *intf, struct sdr_record_list *sdrr)
   }
 
   sdr_rq = (struct sdr_add_rq *)malloc(sizeof(*sdr_rq) + sdr_max_write_len);
-  if (sdr_rq == NULL) {
+  if (!sdr_rq) {
     lprintf(LOG_ERR, "ipmitool: malloc failure");
     return -1;
   }
@@ -202,11 +202,11 @@ ipmi_sdr_repo_clear(struct ipmi_intf *intf)
 
   for (try = 0; try < 5; try++) {
     rsp = intf->sendrecv(intf, &req);
-    if (rsp == NULL) {
+    if (!rsp) {
       lprintf(LOG_ERR, "Unable to clear SDRR");
       return -1;
     }
-    if (rsp->ccode > 0) {
+    if (rsp->ccode) {
       lprintf(LOG_ERR, "Unable to clear SDRR: %s",
         val2str(rsp->ccode, completion_code_vals));
       return -1;
@@ -248,11 +248,11 @@ sdrr_get_records(struct ipmi_intf *intf, struct ipmi_sdr_iterator *itr,
   queue->head = NULL;
   queue->tail = NULL;
 
-  while ((header = ipmi_sdr_get_next_header(intf, itr)) != NULL) {
+  while ((header = ipmi_sdr_get_next_header(intf, itr))) {
     struct sdr_record_list *sdrr;
 
     sdrr = malloc(sizeof (struct sdr_record_list));
-    if (sdrr == NULL) {
+    if (!sdrr) {
       lprintf(LOG_ERR, "ipmitool: malloc failure");
       return -1;
     }
@@ -263,10 +263,10 @@ sdrr_get_records(struct ipmi_intf *intf, struct ipmi_sdr_iterator *itr,
     sdrr->type = header->type;
     sdrr->length = header->length;
     sdrr->raw = ipmi_sdr_get_record(intf, header, itr);
-    (void)ipmi_sdr_print_name_from_rawentry(intf,  sdrr->id, sdrr->type,sdrr->raw);
+    (void)ipmi_sdr_print_name_from_rawentry(sdrr->id, sdrr->type,sdrr->raw);
 
     /* put in the record queue */
-    if (queue->head == NULL)
+    if (!queue->head)
       queue->head = sdrr;
     else
       queue->tail->next = sdrr;
@@ -295,12 +295,12 @@ sdr_copy_to_sdrr(struct ipmi_intf *intf, int use_builtin,
 
   printf("Load SDRs from 0x%x\n", from_addr);
   rc = sdrr_get_records(intf, itr, &sdrr_queue);
-  ipmi_sdr_end(intf, itr);
+  ipmi_sdr_end(itr);
   /* ... */
 
   /* write the SDRs to the destination SDR Repository */
   intf->target_addr = to_addr;
-  for (sdrr = sdrr_queue.head; sdrr != NULL; sdrr = sdrr_next) {
+  for (sdrr = sdrr_queue.head; sdrr; sdrr = sdrr_next) {
     sdrr_next = sdrr->next;
     rc = ipmi_sdr_add_record(intf, sdrr);
     if(rc < 0){
@@ -433,7 +433,7 @@ int ipmi_parse_range_list(const char *rangeList, unsigned char * pHexList)
 
     do
     {
-      if(nextString != NULL) 
+      if(nextString) 
       {
         (*nextString)= 0;
         nextString   ++;
@@ -446,8 +446,7 @@ int ipmi_parse_range_list(const char *rangeList, unsigned char * pHexList)
 
       /* At this point, it is a single entry or a range */
       rangeString = strstr( inProcessString, "-" );
-      if(rangeString == NULL) 
-      {
+      if (!rangeString) {
         unsigned char decValue = 0;
 
         /* Single entry */
@@ -597,7 +596,7 @@ ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue)
     lprintf(LOG_DEBUG, "binHdr[4] (length) = 0x%02x", binHdr[4]);
 
     sdrr = malloc(sizeof(*sdrr));
-    if (sdrr == NULL) {
+    if (!sdrr) {
       lprintf(LOG_ERR, "ipmitool: malloc failure");
       rc = -1;
       break;
@@ -607,7 +606,8 @@ ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue)
     sdrr->type = binHdr[3];
     sdrr->length = binHdr[4];
 
-    if ((sdrr->raw = malloc(sdrr->length)) == NULL) {
+    sdrr->raw = malloc(sdrr->length);
+    if (!sdrr->raw) {
       lprintf(LOG_ERR, "ipmitool: malloc failure");
       free(sdrr);
       sdrr = NULL;
@@ -626,7 +626,7 @@ ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue)
     }
 
     /* put in the record queue */
-    if (queue->head == NULL)
+    if (!queue->head)
       queue->head = sdrr;
     else
       queue->tail->next = sdrr;
@@ -654,7 +654,7 @@ ipmi_sdr_add_from_file(struct ipmi_intf *intf, const char *ifile)
   }
 
   /* write the SDRs to the SDR Repository */
-  for (sdrr = sdrr_queue.head; sdrr != NULL; sdrr = sdrr_next) {
+  for (sdrr = sdrr_queue.head; sdrr; sdrr = sdrr_next) {
     sdrr_next = sdrr->next;
     rc = ipmi_sdr_add_record(intf, sdrr);
     if(rc < 0){
-- 
cgit v1.2.3