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

refactor
---

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 5f7162fd2a..aeae6223fc 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4726,24 +4726,19 @@ ctables_prepare_table (struct ctables_table *t)
 
                   case CTAT_ROW:
                   case CTAT_COL:
-                    if (a == atb && t->label_axis[ata] == atb)
-                      n_drop = 0;
-                    else if (a == atb && t->label_axis[atb] == ata)
+                    if (a == atb)
                       {
-                        drop_inner = true;
-                        n_drop = 0;
-                      }
-                    else if (a == atb && t->label_axis[atb] == PIVOT_AXIS_LAYER)
-                      {
-                        drop_inner = true;
-                        n_drop = 0;
-                      }
-                    else
-                      {
-                        n_drop = a == atb;
-                        if (a == ata && t->label_axis[ata] == atb)
-                          n_drop++;
+                        if (t->label_axis[ata] == atb)
+                          ;
+                        else if (t->label_axis[atb] == ata)
+                          drop_inner = true;
+                        else if (t->label_axis[atb] == PIVOT_AXIS_LAYER)
+                          drop_inner = true;
+                        else
+                          n_drop = 1;
                       }
+                    if (a == ata && t->label_axis[ata] == atb)
+                      n_drop++;
                     break;
 
                   case CTAT_LAYER: