Convert many uses of `int' to `bool'.

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index 16e55fe7780c20d628dd6c437f6c52e63c55f3f1..fa71f5981e1cd177e7a3edb06a5b2294bb616150 100644 (file)
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,7 @@
+Tue May  9 21:08:05 2006  Ben Pfaff  <blp@gnu.org>
+
+       * casefile.c: Convert many uses of `int' to `bool'.
+
 Sat May  6 22:49:43 2006  Ben Pfaff  <blp@gnu.org>
 
        * transformations.c (trns_chain_destroy): Destroy chain's trns

diff --git a/src/data/casefile.c b/src/data/casefile.c
index 8b1ac82838f55ff49d587ec1a14f7d620cad4f62..76f1d97a9bae6ec2cb0060eddf8594beb2ad475a 100644 (file)
--- a/src/data/casefile.c
+++ b/src/data/casefile.c
@@ -129,7 +129,7 @@ struct casefile
     enum { MEMORY, DISK } storage;      /* Where cases are stored. */
     enum { WRITE, READ } mode;          /* Is writing or reading allowed? */
     struct casereader *readers;         /* List of our readers. */
-    int being_destroyed;                /* Does a destructive reader exist? */
+    bool being_destroyed;               /* Does a destructive reader exist? */
     bool ok;                            /* False after I/O error. */
 
     /* Memory storage. */
@@ -149,7 +149,7 @@ struct casereader
     struct casereader *next, *prev;     /* Next, prev in casefile's list. */
     struct casefile *cf;                /* Our casefile. */
     unsigned long case_idx;             /* Case number of current case. */
-    int destructive;                    /* Is this a destructive reader? */
+    bool destructive;                   /* Is this a destructive reader? */
 
     /* Disk storage. */
     int fd;                             /* File descriptor. */
@@ -272,9 +272,9 @@ casefile_error (const struct casefile *cf)
   return !cf->ok;
 }
 
-/* Returns nonzero only if casefile CF is stored in memory (instead of on
-   disk). */
-int
+/* Returns true only if casefile CF is stored in memory (instead of on
+   disk), false otherwise. */
+bool
 casefile_in_core (const struct casefile *cf) 
 {
   assert (cf != NULL);
@@ -635,13 +635,13 @@ casereader_get_casefile (const struct casereader *reader)
 /* Reads a copy of the next case from READER into C.
    Caller is responsible for destroying C.
    Returns true if successful, false at end of file. */
-int
+bool
 casereader_read (struct casereader *reader, struct ccase *c) 
 {
   assert (reader != NULL);
   
   if (!reader->cf->ok || reader->case_idx >= reader->cf->case_cnt) 
-    return 0;
+    return false;
 
   if (reader->cf->storage == MEMORY) 
     {
@@ -650,14 +650,14 @@ casereader_read (struct casereader *reader, struct ccase *c)
 
       case_clone (c, &reader->cf->cases[block_idx][case_idx]);
       reader->case_idx++;
-      return 1;
+      return true;
     }
   else 
     {
       if (reader->buffer_pos + reader->cf->value_cnt > reader->cf->buffer_size)
         {
           if (!fill_buffer (reader))
-            return 0;
+            return false;
           reader->buffer_pos = 0;
         }
 
@@ -667,7 +667,7 @@ casereader_read (struct casereader *reader, struct ccase *c)
       reader->case_idx++;
 
       case_clone (c, &reader->c);
-      return 1;
+      return true;
     }
 }
 
@@ -675,7 +675,7 @@ casereader_read (struct casereader *reader, struct ccase *c)
    to the caller.  Caller is responsible for destroying C.
    Returns true if successful, false at end of file or on I/O
    error. */
-int
+bool
 casereader_read_xfer (struct casereader *reader, struct ccase *c)
 {
   assert (reader != NULL);
@@ -692,7 +692,7 @@ casereader_read_xfer (struct casereader *reader, struct ccase *c)
 
       case_move (c, read_case);
       reader->case_idx++;
-      return 1;
+      return true;
     }
 }
 
@@ -787,16 +787,14 @@ static int safe_close (int fd)
 static void
 register_atexit (void) 
 {
-  static int registered = 0;
+  static bool registered = false;
   if (!registered) 
     {
-      registered = 1;
+      registered = true;
       atexit (exit_handler);
     }
 }
 
-
-
 /* atexit() handler that closes and deletes our temporary
    files. */
 static void

diff --git a/src/data/casefile.h b/src/data/casefile.h
index 8c56dbbb9c52646ec8a4afd07dc0c5a5fea8529a..e60566e6327b7c5ee8b4a6cf0667a15fe5022196 100644 (file)
--- a/src/data/casefile.h
+++ b/src/data/casefile.h
@@ -31,7 +31,7 @@ struct casefile *casefile_create (size_t value_cnt);
 void casefile_destroy (struct casefile *);
 
 bool casefile_error (const struct casefile *);
-int casefile_in_core (const struct casefile *);
+bool casefile_in_core (const struct casefile *);
 bool casefile_to_disk (const struct casefile *);
 bool casefile_sleep (const struct casefile *);
 
@@ -46,8 +46,8 @@ struct casereader *casefile_get_reader (const struct casefile *);
 struct casereader *casefile_get_destructive_reader (struct casefile *);
 
 const struct casefile *casereader_get_casefile (const struct casereader *);
-int casereader_read (struct casereader *, struct ccase *);
-int casereader_read_xfer (struct casereader *, struct ccase *);
+bool casereader_read (struct casereader *, struct ccase *);
+bool casereader_read_xfer (struct casereader *, struct ccase *);
 void casereader_destroy (struct casereader *);
 
 unsigned long casereader_cnum(const struct casereader *);