X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fsort.h;h=af443edc34b8b4f5b5003b2d73d8f805b29003ce;hb=92fb12eb06716d14c05b781f5d9dcde956d77c30;hp=c8f97af0a98500ca291da93d610d709f32ce0338;hpb=1d985886f778e35f8d89c4e3c897b79fde8de6ed;p=pspp

diff --git a/src/sort.h b/src/sort.h
index c8f97af0a9..af443edc34 100644
--- a/src/sort.h
+++ b/src/sort.h
@@ -14,27 +14,50 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #if !sort_h
 #define sort_h 1
 
 #include <stddef.h>
-#include "bool.h"
+#include <stdbool.h>
 
 struct casereader;
 struct dictionary;
 struct variable;
 
-struct sort_criteria *sort_parse_criteria (const struct dictionary *,
-                                           struct variable ***, int *,
-                                           bool *saw_direction);
+
+/* Sort direction. */
+enum sort_direction
+  {
+    SRT_ASCEND,			/* A, B, C, ..., X, Y, Z. */
+    SRT_DESCEND			/* Z, Y, X, ..., C, B, A. */
+  };
+
+/* A sort criterion. */
+struct sort_criterion
+  {
+    int fv;                     /* Variable data index. */
+    int width;                  /* 0=numeric, otherwise string width. */
+    enum sort_direction dir;    /* Sort direction. */
+  };
+
+/* A set of sort criteria. */
+struct sort_criteria 
+  {
+    struct sort_criterion *crits;
+    size_t crit_cnt;
+  };
+
+
 void sort_destroy_criteria (struct sort_criteria *);
 
 struct casefile *sort_execute (struct casereader *,
                                const struct sort_criteria *);
+
 int sort_active_file_in_place (const struct sort_criteria *);
+
 struct casefile *sort_active_file_to_casefile (const struct sort_criteria *);
 
 #endif /* !sort_h */