From 830b4f443ff6a5d213900d4b8b6fec6e56b142f6 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Fri, 25 Mar 2016 15:35:34 +0100
Subject: [PATCH] struct variable, #3/18, cleanup struct variable field
 initialisation

---
 src/frontend/options.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/frontend/options.c b/src/frontend/options.c
index cf112052f..c66fc4fb6 100644
--- a/src/frontend/options.c
+++ b/src/frontend/options.c
@@ -51,14 +51,14 @@ cp_enqvar(char *word)
             return (NULL);
 
         if (d->v_length == 1) {
+            double value = isreal(d)
+                ? d->v_realdata[0]
+                : realpart(d->v_compdata[0]);
             vv = TMALLOC(struct variable, 1);
             vv->va_name = copy(word);
             vv->va_next = NULL;
             vv->va_type = CP_REAL;
-            if (isreal(d))
-                vv->va_real = d->v_realdata[0];
-            else
-                vv->va_real = realpart(d->v_compdata[0]);
+            vv->va_real = value;
         } else {
             vv = TMALLOC(struct variable, 1);
             vv->va_name = copy(word);
@@ -66,14 +66,14 @@ cp_enqvar(char *word)
             vv->va_type = CP_LIST;
             vv->va_vlist = NULL;
             for (i = d->v_length; --i >= 0;) {
+                double value = isreal(d)
+                    ? d->v_realdata[i]
+                    : realpart(d->v_compdata[i]);
                 tv = TMALLOC(struct variable, 1);
                 tv->va_name = NULL;
                 tv->va_next = vv->va_vlist;
                 tv->va_type = CP_REAL;
-                if (isreal(d))
-                    tv->va_real = d->v_realdata[i];
-                else
-                    tv->va_real = realpart(d->v_compdata[i]);
+                tv->va_real = value;
                 vv->va_vlist = tv;
             }
         }