From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 14 Aug 2022 05:21:23 +0000 (-0700)
Subject: refactoring
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=710f5de78998ae74020b8a401836dabca4df355e

refactoring
---

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index fa43892176..ff8f1abbc0 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4701,15 +4701,8 @@ ctables_prepare_table (struct ctables_table *t)
                          && t->clabels_from_axis != PIVOT_AXIS_LAYER
                          && t->clabels_to_axis == PIVOT_AXIS_LAYER)
                   {
-                    if (a == PIVOT_AXIS_LAYER)
-                      n_drop = 0;
-                    else if (a != t->clabels_from_axis)
-                      n_drop = 1;
-                    else
-                      {
-                        drop_inner = true;
-                        n_drop = 0;
-                      }
+                    drop_inner = a == t->clabels_from_axis;
+                    n_drop = a != t->clabels_from_axis && a != PIVOT_AXIS_LAYER;
                   }
                 else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
                   n_drop = 0;