X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable-paste.c;h=c1054d1369baf1e5c05915edd8221004206c8ec9;hb=e04c680aae366f5af85cd50776875fcdf3c8927a;hp=ad32de7276e52d606339d46ba5ef5d8925967b7a;hpb=ff2c83253f1f450a8bd1d36c7efb8b59cdfed058;p=pspp diff --git a/src/output/table-paste.c b/src/output/table-paste.c index ad32de7276..c1054d1369 100644 --- a/src/output/table-paste.c +++ b/src/output/table-paste.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2011 Free Software Foundation, Inc. + Copyright (C) 2009, 2011, 2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -148,6 +148,8 @@ table_paste (struct table *a, struct table *b, enum table_axis orientation) if (b == NULL) return a; + assert (a->n[!orientation] == b->n[!orientation]); + /* Handle tables that know how to paste themselves. */ if (!table_is_shared (a) && !table_is_shared (b) && a != b) { @@ -182,11 +184,11 @@ table_hpaste (struct table *left, struct table *right) return table_paste (left, right, TABLE_HORZ); } -/* Shorthand for table_paste (left, right, TABLE_VERT). */ +/* Shorthand for table_paste (top, bottom, TABLE_VERT). */ struct table * -table_vpaste (struct table *left, struct table *right) +table_vpaste (struct table *top, struct table *bottom) { - return table_paste (left, right, TABLE_VERT); + return table_paste (top, bottom, TABLE_VERT); } static void