minor edits
[pspp-builds.git] / src / var-display.c
index 47147dfb0fba0de4ad7e371c5294273610db5e90..8243ac626b039d9600717a52a15dff01055a5b00 100644 (file)
@@ -14,8 +14,8 @@
 
    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. */
 
 #include <config.h>
 #include <stdio.h>
@@ -56,11 +56,19 @@ cmd_variable_alignment (void)
            align = ALIGN_RIGHT;
          else if ( lex_match_id("CENTER"))
            align = ALIGN_CENTRE;
-         else
-           return CMD_FAILURE;
+         else 
+            {
+              free (v);
+              return CMD_FAILURE; 
+            }
 
          lex_force_match(')');
        }
+      else 
+        {
+          free (v);
+          return CMD_FAILURE; 
+        }
 
       for( i = 0 ; i < nv ; ++i ) 
        v[i]->alignment = align;
@@ -134,12 +142,20 @@ cmd_variable_level (void)
            level = MEASURE_ORDINAL;
          else if ( lex_match_id("NOMINAL"))
            level = MEASURE_NOMINAL;
-         else
-           return CMD_FAILURE;
+         else 
+            {
+              free (v);
+              return CMD_FAILURE; 
+            }
 
          lex_force_match(')');
        }
-
+      else
+        {
+          free (v);
+          return CMD_FAILURE; 
+        }
+      
       for( i = 0 ; i < nv ; ++i ) 
        v[i]->measure = level ;