From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 14 Aug 2022 06:29:44 +0000 (-0700)
Subject: refactor
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=588d9107cd4b6eee3a0c3ece3cf53868e22c52f4

refactor
---

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index c3c797a52c..e78c0cf169 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4702,7 +4702,7 @@ ctables_prepare_table (struct ctables_table *t)
                   if (k != nest->scale_idx)
                     nest->areas[at][nest->n_areas[at]++] = k;
 
-                int n_drop = 0;
+                int n_drop;
                 switch (at)
                   {
                   case CTAT_SUBTABLE:
@@ -4723,19 +4723,21 @@ ctables_prepare_table (struct ctables_table *t)
 
                   case CTAT_ROW:
                   case CTAT_COL:
-                    if (a == atb)
-                      {
-                        if (t->clabels_from_axis == atb)
-                          n_drop = -1;
-                        else if (t->clabels_to_axis != atb)
-                          n_drop = 1;
-                      }
-                    else if (a == ata)
+                    if (a == ata)
                       n_drop = t->label_axis[ata] == atb;
+                    else if (a != atb)
+                      n_drop = 0;
+                    else if (t->clabels_from_axis == atb)
+                      n_drop = -1;
+                    else if (t->clabels_to_axis != atb)
+                      n_drop = 1;
+                    else
+                      n_drop = 0;
                     break;
 
                   case CTAT_LAYER:
                   case CTAT_TABLE:
+                    n_drop = 0;
                     break;
                   }