[Pspp-cvs] pspp/src/data variable.c ChangeLog

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/05/02 22:44:55

Modified files:
        src/data       : variable.c ChangeLog 

Log message:
        Declarations must precede statements for C90 compliance.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/variable.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/ChangeLog.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: pspp/src/data/ChangeLog
diff -u pspp/src/data/ChangeLog:1.25 pspp/src/data/ChangeLog:1.26
--- pspp/src/data/ChangeLog:1.25        Tue May  2 03:51:43 2006
+++ pspp/src/data/ChangeLog     Tue May  2 22:44:55 2006
@@ -1,3 +1,8 @@
+Tue May  2 15:43:36 2006  Ben Pfaff  <address@hidden>
+
+       * variable.c (width_to_bytes): Declarations must precede
+       statements for C90 compliance.
+
 Tue May  2 10:42:05 WST 2006 John Darrington <address@hidden>
 
        * data-out.c, data-in.c, variable.c, variable.h: New functions 
Index: pspp/src/data/variable.c
diff -u pspp/src/data/variable.c:1.6 pspp/src/data/variable.c:1.7
--- pspp/src/data/variable.c:1.6        Tue May  2 03:51:43 2006
+++ pspp/src/data/variable.c    Tue May  2 22:44:55 2006
@@ -432,6 +432,8 @@
 int
 width_to_bytes(int width)
 {
+  const int chunks = width / EFFECTIVE_LONG_STRING_LENGTH ;
+  const int remainder = width - (chunks * EFFECTIVE_LONG_STRING_LENGTH) ;
   int bytes, mod8;
 
   assert (width >= 0);
@@ -442,9 +444,6 @@
   if ( width <= MAX_LONG_STRING) 
     return MAX_SHORT_STRING * DIV_RND_UP(width, MAX_SHORT_STRING);
 
-  const int chunks = width / EFFECTIVE_LONG_STRING_LENGTH ;
-
-  const int remainder = width - (chunks * EFFECTIVE_LONG_STRING_LENGTH) ;
 
   bytes =  remainder + (chunks * (MAX_LONG_STRING + 1) );