[libvirt] [PATCH] nss: Simplify move_and_align

Michal Privoznik mprivozn at redhat.com
Thu Apr 7 07:31:06 UTC 2016


What this function does can be written much shorter.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 tools/nss/libvirt_nss.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c
index de34baf..587b171 100644
--- a/tools/nss/libvirt_nss.c
+++ b/tools/nss/libvirt_nss.c
@@ -263,12 +263,10 @@ move_and_align(void *buf, size_t len, size_t *idx)
     char *buffer = buf;
     size_t move = LIBVIRT_ALIGN(len);
 
-    if (!idx)
-        return buffer + move;
+    if (idx)
+        *idx += move;
 
-    *idx += move;
-
-    return buffer + *idx;
+    return buffer + move;
 }
 
 enum nss_status
-- 
2.7.3




More information about the libvir-list mailing list