From: Vratko Polak <vrpolak@cisco.com>
Date: Wed, 2 Dec 2020 17:45:16 +0000 (+0100)
Subject: stats: char-pointer arithmetic style-up
X-Git-Tag: v21.06-rc0~78
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F36%2F30236%2F3;p=vpp.git

stats: char-pointer arithmetic style-up

Char* typed shared_header value appears multiple times,
so store it is a variable.
Pointer "p" value is used more frequently casted to char*,
so use that type for it, and convert to void* only at return.

Type: style
Fixes: 41f15ae1dfd4ac1777b684fdc763d12496209418

Change-Id: I7b3f1e6a43c020acd7ae561f87d12237b07fcd66
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/src/vpp-api/client/stat_client.h b/src/vpp-api/client/stat_client.h
index b2457ad6e48..730badd1728 100644
--- a/src/vpp-api/client/stat_client.h
+++ b/src/vpp-api/client/stat_client.h
@@ -101,12 +101,10 @@ _time_now_nsec (void)
 static inline void *
 stat_segment_adjust (stat_client_main_t * sm, void *data)
 {
-  void *p = (void *) ((char *) sm->shared_header +
-		      ((char *) data - (char *) sm->shared_header->base));
-  if ((char *) p > (char *) sm->shared_header &&
-      (((char *) p + sizeof (p)) <
-       ((char *) sm->shared_header + sm->memory_size)))
-    return p;
+  char *csh = (char *) sm->shared_header;
+  char *p = csh + ((char *) data - (char *) sm->shared_header->base);
+  if (p > csh && p + sizeof (p) < csh + sm->memory_size)
+    return (void *) p;
   return 0;
 }