rubyfb 0.5.5 → 0.5.6

data/ext/Backup.h

@@ -25,13 +25,13 @@
 #ifndef FIRERUBY_BACKUP_H
 #define FIRERUBY_BACKUP_H
 
-   /* Includes. */
+/* Includes. */
    #ifndef RUBY_H_INCLUDED
       #include "ruby.h"
       #define RUBY_H_INCLUDED
    #endif
 
-   /* Function prototypes. */
-   void Init_Backup(VALUE);
+/* Function prototypes. */
+void Init_Backup(VALUE);
 
 #endif /* FIRERUBY_BACKUP_H */

data/ext/Blob.c

@@ -3,20 +3,20 @@
  *----------------------------------------------------------------------------*/
 /**
  * Copyright � Peter Wood, 2005
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at 
+ * License. You may obtain a copy of the License at
  *
  * http://www.mozilla.org/MPL/
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
  * the specificlanguage governing rights and  limitations under the License.
- * 
+ *
  * The Original Code is the FireRuby extension for the Ruby language.
- * 
- * The Initial Developer of the Original Code is Peter Wood. All Rights 
+ *
+ * The Initial Developer of the Original Code is Peter Wood. All Rights
  * Reserved.
  *
  * @author  Peter Wood
@@ -47,24 +47,20 @@ VALUE cBlob;
  * @param  klass  A reference to the Blob Class object.
  *
  */
-static VALUE allocateBlob(VALUE klass)
-{
-   VALUE      instance;
-   BlobHandle *blob = ALLOC(BlobHandle);
-   
-   if(blob != NULL)
-   {
-      memset(&blob->description, 0, sizeof(ISC_BLOB_DESC));
-      blob->segments = blob->size = 0;
-      blob->handle   = 0;
-      instance       = Data_Wrap_Struct(klass, NULL, blobFree, blob);
-   }
-   else
-   {
-      rb_raise(rb_eNoMemError, "Memory allocation failure allocating a blob.");
-   }
-   
-   return(instance);
+static VALUE allocateBlob(VALUE klass) {
+  VALUE instance;
+  BlobHandle *blob = ALLOC(BlobHandle);
+
+  if(blob != NULL) {
+    memset(&blob->description, 0, sizeof(ISC_BLOB_DESC));
+    blob->segments = blob->size = 0;
+    blob->handle   = 0;
+    instance       = Data_Wrap_Struct(klass, NULL, blobFree, blob);
+  } else {
+    rb_raise(rb_eNoMemError, "Memory allocation failure allocating a blob.");
+  }
+
+  return(instance);
 }
 
 
@@ -76,10 +72,9 @@ static VALUE allocateBlob(VALUE klass)
  * @return  A reference to the newly initialized Blob object.
  *
  */
-VALUE initializeBlob(VALUE self)
-{
-   rb_iv_set(self, "@data", Qnil);
-   return(self);
+VALUE initializeBlob(VALUE self) {
+  rb_iv_set(self, "@data", Qnil);
+  return(self);
 }
 
 
@@ -92,29 +87,25 @@ VALUE initializeBlob(VALUE self)
  * @return  A reference to a String containing the Blob object data.
  *
  */
-static VALUE getBlobData(VALUE self)
-{
-   VALUE data = rb_iv_get(self, "@data");
-   
-   if(data == Qnil)
-   {
-      BlobHandle *blob   = NULL;
-      
-      Data_Get_Struct(self, BlobHandle, blob);
-      if(blob->size > 0)
-      {
-         char *buffer = loadBlobData(blob);
-         
-         if(buffer != NULL)
-         {
-            data = rb_str_new(buffer, blob->size);
-         }
-         free(buffer);
+static VALUE getBlobData(VALUE self) {
+  VALUE data = rb_iv_get(self, "@data");
+
+  if(data == Qnil) {
+    BlobHandle *blob   = NULL;
+
+    Data_Get_Struct(self, BlobHandle, blob);
+    if(blob->size > 0) {
+      char *buffer = loadBlobData(blob);
+
+      if(buffer != NULL) {
+        data = rb_str_new(buffer, blob->size);
       }
-      rb_iv_set(self, "@data", data);
-   }
-   
-   return(data);
+      free(buffer);
+    }
+    rb_iv_set(self, "@data", data);
+  }
+
+  return(data);
 }
 
 
@@ -128,29 +119,25 @@ static VALUE getBlobData(VALUE self)
  * @return  A reference to the closed Blob object.
  *
  */
-static VALUE closeBlob(VALUE self)
-{
-   VALUE      data  = rb_iv_get(self, "@data");
-   BlobHandle *blob = NULL;
-   
-   if(data != Qnil)
-   {
-      rb_iv_set(self, "@data", Qnil);
-   }
-   
-   Data_Get_Struct(self, BlobHandle, blob);
-   if(blob->handle != 0)
-   {
-      ISC_STATUS status[20];
-      
-      if(isc_close_blob(status, &blob->handle) != 0)
-      {
-         rb_fireruby_raise(status, "Error closing blob.");
-      }
-      blob->handle = 0;
-   }
-   
-   return(self);
+static VALUE closeBlob(VALUE self) {
+  VALUE data  = rb_iv_get(self, "@data");
+  BlobHandle *blob = NULL;
+
+  if(data != Qnil) {
+    rb_iv_set(self, "@data", Qnil);
+  }
+
+  Data_Get_Struct(self, BlobHandle, blob);
+  if(blob->handle != 0) {
+    ISC_STATUS status[ISC_STATUS_LENGTH];
+
+    if(isc_close_blob(status, &blob->handle) != 0) {
+      rb_fireruby_raise(status, "Error closing blob.");
+    }
+    blob->handle = 0;
+  }
+
+  return(self);
 }
 
 
@@ -163,27 +150,24 @@ static VALUE closeBlob(VALUE self)
  * @return  A reference to the last return value from the block called.
  *
  */
-static VALUE eachBlobSegment(VALUE self)
-{
-   VALUE result = Qnil;
-   
-   if(rb_block_given_p())
-   {
-      BlobHandle     *blob    = NULL;
-      char           *segment = NULL;
-      unsigned short size     = 0;
-      
-      Data_Get_Struct(self, BlobHandle, blob);
+static VALUE eachBlobSegment(VALUE self) {
+  VALUE result = Qnil;
+
+  if(rb_block_given_p()) {
+    BlobHandle     *blob    = NULL;
+    char           *segment = NULL;
+    unsigned short size     = 0;
+
+    Data_Get_Struct(self, BlobHandle, blob);
+    segment = loadBlobSegment(blob, &size);
+    while(segment != NULL) {
+      result = rb_yield(rb_str_new(segment, size));
+      free(segment);
       segment = loadBlobSegment(blob, &size);
-      while(segment != NULL)
-      {
-         result = rb_yield(rb_str_new(segment, size));
-         free(segment);
-         segment = loadBlobSegment(blob, &size);
-      }
-   }
-   
-   return(result);
+    }
+  }
+
+  return(result);
 }
 
 
@@ -207,68 +191,54 @@ BlobHandle *openBlob(ISC_QUAD blobId,
                      char *table,
                      char *column,
                      isc_db_handle *connection,
-                     isc_tr_handle *transaction)
-{
-   BlobHandle *blob = ALLOC(BlobHandle);
-   
-   if(blob != NULL)
-   {
-      ISC_STATUS status[20];
-      
-      /* Extract the blob details and open it. */
-      blob->handle = 0;
-      isc_blob_default_desc(&blob->description,
-                            (unsigned char *)table,
-                            (unsigned char *)column);
-      if(isc_open_blob2(status, connection, transaction, &blob->handle, &blobId,
-                        0, NULL) == 0)
-      {
-         char items[] = {isc_info_blob_num_segments,
-                         isc_info_blob_total_length},
-              data[]  = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-              
-         if(isc_blob_info(status, &blob->handle, 2, items, 20, data) == 0)
-         {
-            int offset = 0,
-                done   = 0;
-            
-            while(done < 2)
-            {
-               int length = isc_vax_integer(&data[offset + 1], 2);
-               
-               if(data[offset] == isc_info_blob_num_segments)
-               {
-                  blob->segments = isc_vax_integer(&data[offset + 3], length);
-                  done++;
-               }
-               else if(data[offset] == isc_info_blob_total_length)
-               {
-                  blob->size = isc_vax_integer(&data[offset + 3], length);
-                  done++;
-               }
-               else
-               {
-                  free(blob);
-                  rb_fireruby_raise(NULL, "Error reading blob details.");
-               }
-               offset += length + 3;
-            }
-         }
-         else
-         {
+                     isc_tr_handle *transaction) {
+  BlobHandle *blob = ALLOC(BlobHandle);
+
+  if(blob != NULL) {
+    ISC_STATUS status[ISC_STATUS_LENGTH];
+
+    /* Extract the blob details and open it. */
+    blob->handle = 0;
+    isc_blob_default_desc(&blob->description,
+                          (unsigned char *)table,
+                          (unsigned char *)column);
+    if(isc_open_blob2(status, connection, transaction, &blob->handle, &blobId,
+                      0, NULL) == 0) {
+      char items[] = {isc_info_blob_num_segments,
+                      isc_info_blob_total_length},
+           data[]  = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+      if(isc_blob_info(status, &blob->handle, 2, items, 20, data) == 0) {
+        int offset = 0,
+            done   = 0;
+
+        while(done < 2) {
+          int length = isc_vax_integer(&data[offset + 1], 2);
+
+          if(data[offset] == isc_info_blob_num_segments) {
+            blob->segments = isc_vax_integer(&data[offset + 3], length);
+            done++;
+          } else if(data[offset] == isc_info_blob_total_length) {
+            blob->size = isc_vax_integer(&data[offset + 3], length);
+            done++;
+          } else {
             free(blob);
-            rb_fireruby_raise(status, "Error fetching blob details.");
-         }
-      }
-      else
-      {
-         free(blob);
-         rb_fireruby_raise(status, "Error opening blob.");
+            rb_fireruby_raise(NULL, "Error reading blob details.");
+          }
+          offset += length + 3;
+        }
+      } else {
+        free(blob);
+        rb_fireruby_raise(status, "Error fetching blob details.");
       }
-   }
-   
-   return(blob);
+    } else {
+      free(blob);
+      rb_fireruby_raise(status, "Error opening blob.");
+    }
+  }
+
+  return(blob);
 }
 
 
@@ -282,47 +252,38 @@ BlobHandle *openBlob(ISC_QUAD blobId,
  *          blob.
  *
  */
-char *loadBlobData(BlobHandle *blob)
-{
-   char *data = NULL;
-   
-   if(blob != NULL && blob->handle != 0)
-   {
-      if((data = ALLOC_N(char, blob->size)) != NULL)
-      {
-         ISC_STATUS status[20],
-                    result = 0;
-         int        offset = 0;
-
-         while(result == 0 || result == isc_segment)
-         {
-            unsigned short quantity  = 0,
-                           available = 0;
-            int            remains   = blob->size - offset;
-
-            available = remains > USHRT_MAX ? USHRT_MAX : remains;
-            result    = isc_get_segment(status, &blob->handle, &quantity,
-                                        available, &data[offset]);
-            if(result != 0 && result != isc_segment && result != isc_segstr_eof)
-            {
-               free(data);
-               rb_fireruby_raise(status, "Error loading blob data.");
-            }
-            offset = offset + quantity;
-         }
-      }
-      else
-      {
-         rb_raise(rb_eNoMemError,
-                  "Memory allocation failure loading blob data.");
+char *loadBlobData(BlobHandle *blob) {
+  char *data = NULL;
+
+  if(blob != NULL && blob->handle != 0) {
+    if((data = ALLOC_N(char, blob->size)) != NULL) {
+      ISC_STATUS status[ISC_STATUS_LENGTH],
+                 result = 0;
+      int offset = 0;
+
+      while(result == 0 || result == isc_segment) {
+        unsigned short quantity  = 0,
+                       available = 0;
+        int remains   = blob->size - offset;
+
+        available = remains > USHRT_MAX ? USHRT_MAX : remains;
+        result    = isc_get_segment(status, &blob->handle, &quantity,
+                                    available, &data[offset]);
+        if(result != 0 && result != isc_segment && result != isc_segstr_eof) {
+          free(data);
+          rb_fireruby_raise(status, "Error loading blob data.");
+        }
+        offset = offset + quantity;
       }
-   }
-   else
-   {
-      rb_fireruby_raise(NULL, "Invalid blob specified for loading.");
-   }
-   
-   return(data);
+    } else {
+      rb_raise(rb_eNoMemError,
+               "Memory allocation failure loading blob data.");
+    }
+  } else {
+    rb_fireruby_raise(NULL, "Invalid blob specified for loading.");
+  }
+
+  return(data);
 }
 
 
@@ -339,39 +300,31 @@ char *loadBlobData(BlobHandle *blob)
  *          segements to be read.
  *
  */
-char *loadBlobSegment(BlobHandle *blob, unsigned short *length)
-{
-   char *data = NULL;
-   
-   *length = 0;
-   if(blob != NULL && blob->handle != 0)
-   {
-      unsigned short size = blob->description.blob_desc_segment_size;
-      
-      if((data = ALLOC_N(char, size)) != NULL)
-      {
-         ISC_STATUS     status[20],
-                        result;
-                    
-         result = isc_get_segment(status, &blob->handle, length, size, data);
-         if(result != 0 && result != isc_segstr_eof)
-         {
-            free(data);
-            rb_fireruby_raise(status, "Error reading blob segment.");
-         }
-      }
-      else
-      {
-         rb_raise(rb_eNoMemError,
-                  "Memory allocation failre loading blob segment.");
+char *loadBlobSegment(BlobHandle *blob, unsigned short *length) {
+  char *data = NULL;
+
+  *length = 0;
+  if(blob != NULL && blob->handle != 0) {
+    unsigned short size = blob->description.blob_desc_segment_size;
+
+    if((data = ALLOC_N(char, size)) != NULL) {
+      ISC_STATUS status[ISC_STATUS_LENGTH],
+                 result;
+
+      result = isc_get_segment(status, &blob->handle, length, size, data);
+      if(result != 0 && result != isc_segstr_eof) {
+        free(data);
+        rb_fireruby_raise(status, "Error reading blob segment.");
       }
-   }
-   else
-   {
-      rb_fireruby_raise(NULL, "Invalid blob specified for loading.");
-   }
-   
-   return(data);
+    } else {
+      rb_raise(rb_eNoMemError,
+               "Memory allocation failre loading blob segment.");
+    }
+  } else {
+    rb_fireruby_raise(NULL, "Invalid blob specified for loading.");
+  }
+
+  return(data);
 }
 
 
@@ -384,20 +337,17 @@ char *loadBlobSegment(BlobHandle *blob, unsigned short *length)
  *               object being collected.
  *
  */
-void blobFree(void *blob)
-{
-   if(blob != NULL)
-   {
-      BlobHandle *handle = (BlobHandle *)blob;
-
-      if(handle->handle != 0)
-      {
-         ISC_STATUS status[20];
-         
-         isc_close_blob(status, &handle->handle);
-      }
-      free(handle);
-   }
+void blobFree(void *blob) {
+  if(blob != NULL) {
+    BlobHandle *handle = (BlobHandle *)blob;
+
+    if(handle->handle != 0) {
+      ISC_STATUS status[ISC_STATUS_LENGTH];
+
+      isc_close_blob(status, &handle->handle);
+    }
+    free(handle);
+  }
 }
 
 
@@ -409,13 +359,12 @@ void blobFree(void *blob)
  *                 under.
  *
  */
-void Init_Blob(VALUE module)
-{
-   cBlob = rb_define_class_under(module, "Blob", rb_cObject);
-   rb_define_alloc_func(cBlob, allocateBlob);
-   rb_define_method(cBlob, "initialize", initializeBlob, 0);
-   rb_define_method(cBlob, "initialize_copy", forbidObjectCopy, 1);
-   rb_define_method(cBlob, "to_s", getBlobData, 0);
-   rb_define_method(cBlob, "close", closeBlob, 0);
-   rb_define_method(cBlob, "each", eachBlobSegment, 0);
+void Init_Blob(VALUE module) {
+  cBlob = rb_define_class_under(module, "Blob", rb_cObject);
+  rb_define_alloc_func(cBlob, allocateBlob);
+  rb_define_method(cBlob, "initialize", initializeBlob, 0);
+  rb_define_method(cBlob, "initialize_copy", forbidObjectCopy, 1);
+  rb_define_method(cBlob, "to_s", getBlobData, 0);
+  rb_define_method(cBlob, "close", closeBlob, 0);
+  rb_define_method(cBlob, "each", eachBlobSegment, 0);
 }

data/ext/Blob.h

@@ -3,20 +3,20 @@
  *----------------------------------------------------------------------------*/
 /**
  * Copyright � Peter Wood, 2005
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at 
+ * License. You may obtain a copy of the License at
  *
  * http://www.mozilla.org/MPL/
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
  * the specificlanguage governing rights and  limitations under the License.
- * 
+ *
  * The Original Code is the FireRuby extension for the Ruby language.
- * 
- * The Initial Developer of the Original Code is Peter Wood. All Rights 
+ *
+ * The Initial Developer of the Original Code is Peter Wood. All Rights
  * Reserved.
  *
  * @author  Peter Wood
@@ -25,41 +25,40 @@
 #ifndef FIRERUBY_BLOB_H
 #define FIRERUBY_BLOB_H
 
-   /* Includes. */
+/* Includes. */
    #ifndef FIRERUBY_FIRE_RUBY_EXCEPTION_H
       #include "FireRubyException.h"
    #endif
-   
+
    #ifndef IBASE_H_INCLUDED
       #include "ibase.h"
       #define IBASE_H_INCLUDED
    #endif
-   
+
    #ifndef RUBY_H_INCLUDED
       #include "ruby.h"
       #define RUBY_H_INCLUDED
    #endif
-   
-   /* Type definitions. */
-   typedef struct
-   {
-      ISC_BLOB_DESC   description;
-      ISC_LONG        segments,
-                      size;
-      isc_blob_handle handle;
-   } BlobHandle;
-   
-   /* Data elements. */
-   extern VALUE cBlob;
-   
-   /* Function prototypes. */
-   BlobHandle *openBlob(ISC_QUAD,
-                        char *,
-                        char *,
-                        isc_db_handle *,
-                        isc_tr_handle *);
-   void Init_Blob(VALUE);
-   void blobFree(void *);
-   VALUE initializeBlob(VALUE);
+
+/* Type definitions. */
+typedef struct {
+  ISC_BLOB_DESC description;
+  ISC_LONG segments,
+           size;
+  isc_blob_handle handle;
+} BlobHandle;
+
+/* Data elements. */
+extern VALUE cBlob;
+
+/* Function prototypes. */
+BlobHandle *openBlob(ISC_QUAD,
+                     char *,
+                     char *,
+                     isc_db_handle *,
+                     isc_tr_handle *);
+void Init_Blob(VALUE);
+void blobFree(void *);
+VALUE initializeBlob(VALUE);
 
 #endif /* FIRERUBY_BLOB_H */