rubyfb 0.5.5 → 0.5.6

data/ext/Row.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,31 +25,30 @@
 #ifndef FIRERUBY_ROW_H
 #define FIRERUBY_ROW_H
 
-   /* Includes. */
+/* Includes. */
    #ifndef RUBY_H_INCLUDED
       #include "ruby.h"
       #define RUBY_H_INCLUDED
    #endif
-   
-   /* Type definitions. */
-   typedef struct
-   {
-      char  name[32],
-            alias[32];
-      VALUE value,
-            type;
-   } ColumnHandle;
-   
-   typedef struct
-   {
-      unsigned int size,
-                   number;
-      ColumnHandle *columns;
-   } RowHandle;
-   
-   /* Function prototypes. */
-   void Init_Row(VALUE);
-   void freeRow(void *);
-   VALUE rb_row_new(VALUE, VALUE, VALUE);
+
+/* Type definitions. */
+typedef struct {
+  char name[32],
+       alias[32];
+  VALUE value,
+        type,
+        scale;
+} ColumnHandle;
+
+typedef struct {
+  unsigned int size,
+               number;
+  ColumnHandle *columns;
+} RowHandle;
+
+/* Function prototypes. */
+void Init_Row(VALUE);
+void freeRow(void *);
+VALUE rb_row_new(VALUE, VALUE, VALUE);
 
 #endif // FIRERUBY_ROW_H

data/ext/ServiceManager.c

@@ -48,20 +48,18 @@ VALUE cServiceManager;
  * @return  A reference to the newly allocated ServiceManager object.
  *
  */
-VALUE allocateServiceManager(VALUE klass)
-{
-   VALUE         instance = Qnil;
-   ManagerHandle *manager = ALLOC(ManagerHandle);
-
-   if(manager == NULL)
-   {
-      rb_raise(rb_eNoMemError,
-               "Memory allocation failure creating a service manager.");
-   }
-   manager->handle = NULL;
-   instance        = Data_Wrap_Struct(klass, NULL, serviceManagerFree, manager);
-
-   return(instance);
+VALUE allocateServiceManager(VALUE klass) {
+  VALUE instance = Qnil;
+  ManagerHandle *manager = ALLOC(ManagerHandle);
+
+  if(manager == NULL) {
+    rb_raise(rb_eNoMemError,
+             "Memory allocation failure creating a service manager.");
+  }
+  manager->handle = NULL;
+  instance        = Data_Wrap_Struct(klass, NULL, serviceManagerFree, manager);
+
+  return(instance);
 }
 
 
@@ -72,13 +70,12 @@ VALUE allocateServiceManager(VALUE klass)
  * @param  host  The name of the database host for the service manager.
  *
  */
-VALUE initializeServiceManager(VALUE self, VALUE host)
-{
-   VALUE text = rb_funcall(host, rb_intern("to_s"), 0);
+VALUE initializeServiceManager(VALUE self, VALUE host) {
+  VALUE text = rb_funcall(host, rb_intern("to_s"), 0);
 
-   rb_iv_set(self, "@host", text);
+  rb_iv_set(self, "@host", text);
 
-   return(self);
+  return(self);
 }
 
 
@@ -94,80 +91,75 @@ VALUE initializeServiceManager(VALUE self, VALUE host)
  * @return  A reference to the newly connected ServiceManager object.
  *
  */
-VALUE connectServiceManager(VALUE self, VALUE user, VALUE password)
-{
-   ManagerHandle *manager  = NULL;
-   char          *buffer   = NULL,
-                 *position = NULL,
-                 *text     = NULL,
-                 *service  = NULL;
-   short         length    = 2,
-                 size      = 0;
-   VALUE         host      = rb_iv_get(self, "@host");
-   ISC_STATUS    status[20];
-
-   Data_Get_Struct(self, ManagerHandle, manager);
-   if(manager->handle != 0)
-   {
-      rb_fireruby_raise(NULL, "Service manager already connected.");
-   }
-
-   /* Calculate the size of the service parameter buffer. */
-   length += strlen(StringValuePtr(user)) + 2;
-   length += strlen(StringValuePtr(password)) + 2;
-
-   /* Create the service parameter buffer. */
-   position = buffer = ALLOC_N(char, length);
-   if(position == NULL)
-   {
-      rb_raise(rb_eNoMemError,
-               "Memory allocation failure creating service parameter buffer.");
-   }
-   memset(buffer, 0, length);
-
-   /* Populate the service parameter buffer. */
-   *position++ = isc_spb_version;
-   *position++ = isc_spb_current_version;
-
-   text        = StringValuePtr(user);
-   size        = strlen(text);
-   *position++ = isc_spb_user_name;
-   *position++ = size;
-   strncpy(position, text, size);
-   position    += size;
-
-   text        = StringValuePtr(password);
-   size        = strlen(text);
-   *position++ = isc_spb_password;
-   *position++ = size;
-   strncpy(position, text, size);
-
-   /* Create the service name. */
-   size    = strlen(StringValuePtr(host)) + 13;
-   service = ALLOC_N(char, size);
-   if(service == NULL)
-   {
-      free(buffer);
-      rb_raise(rb_eNoMemError,
-               "Memory allocation failure service manager service name.");
-   }
-   memset(service, 0, size);
-   sprintf(service, "%s:service_mgr", StringValuePtr(host));
-
-   /* Make the attachment call. */
-   if(isc_service_attach(status, 0, service, &manager->handle, length,
-                         buffer))
-   {
-      free(buffer);
-      free(service);
-      rb_fireruby_raise(status, "Error connecting service manager.");
-   }
-
-   /* Clean up. */
-   free(buffer);
-   free(service);
-
-   return(self);
+VALUE connectServiceManager(VALUE self, VALUE user, VALUE password) {
+  ManagerHandle *manager  = NULL;
+  char          *buffer   = NULL,
+  *position = NULL,
+  *text     = NULL,
+  *service  = NULL;
+  short length    = 2,
+        size      = 0;
+  VALUE host      = rb_iv_get(self, "@host");
+  ISC_STATUS status[ISC_STATUS_LENGTH];
+
+  Data_Get_Struct(self, ManagerHandle, manager);
+  if(manager->handle != 0) {
+    rb_fireruby_raise(NULL, "Service manager already connected.");
+  }
+
+  /* Calculate the size of the service parameter buffer. */
+  length += strlen(StringValuePtr(user)) + 2;
+  length += strlen(StringValuePtr(password)) + 2;
+
+  /* Create the service parameter buffer. */
+  position = buffer = ALLOC_N(char, length);
+  if(position == NULL) {
+    rb_raise(rb_eNoMemError,
+             "Memory allocation failure creating service parameter buffer.");
+  }
+  memset(buffer, 0, length);
+
+  /* Populate the service parameter buffer. */
+  *position++ = isc_spb_version;
+  *position++ = isc_spb_current_version;
+
+  text        = StringValuePtr(user);
+  size        = strlen(text);
+  *position++ = isc_spb_user_name;
+  *position++ = size;
+  strncpy(position, text, size);
+  position    += size;
+
+  text        = StringValuePtr(password);
+  size        = strlen(text);
+  *position++ = isc_spb_password;
+  *position++ = size;
+  strncpy(position, text, size);
+
+  /* Create the service name. */
+  size    = strlen(StringValuePtr(host)) + 13;
+  service = ALLOC_N(char, size);
+  if(service == NULL) {
+    free(buffer);
+    rb_raise(rb_eNoMemError,
+             "Memory allocation failure service manager service name.");
+  }
+  memset(service, 0, size);
+  sprintf(service, "%s:service_mgr", StringValuePtr(host));
+
+  /* Make the attachment call. */
+  if(isc_service_attach(status, 0, service, &manager->handle, length,
+                        buffer)) {
+    free(buffer);
+    free(service);
+    rb_fireruby_raise(status, "Error connecting service manager.");
+  }
+
+  /* Clean up. */
+  free(buffer);
+  free(service);
+
+  return(self);
 }
 
 
@@ -179,23 +171,20 @@ VALUE connectServiceManager(VALUE self, VALUE user, VALUE password)
  * @return  A reference to the disconnected ServiceManager object.
  *
  */
-VALUE disconnectServiceManager(VALUE self)
-{
-   ManagerHandle *manager = NULL;
-
-   Data_Get_Struct(self, ManagerHandle, manager);
-   if(manager->handle != 0)
-   {
-      ISC_STATUS status[20];
-
-      if(isc_service_detach(status, &manager->handle))
-      {
-         rb_fireruby_raise(status, "Error disconnecting service manager.");
-      }
-      manager->handle = 0;
-   }
-
-   return(self);
+VALUE disconnectServiceManager(VALUE self) {
+  ManagerHandle *manager = NULL;
+
+  Data_Get_Struct(self, ManagerHandle, manager);
+  if(manager->handle != 0) {
+    ISC_STATUS status[ISC_STATUS_LENGTH];
+
+    if(isc_service_detach(status, &manager->handle)) {
+      rb_fireruby_raise(status, "Error disconnecting service manager.");
+    }
+    manager->handle = 0;
+  }
+
+  return(self);
 }
 
 
@@ -207,18 +196,16 @@ VALUE disconnectServiceManager(VALUE self)
  * @return  True if the manager is connected, false otherwise.
  *
  */
-VALUE isServiceManagerConnected(VALUE self)
-{
-   VALUE         result   = Qfalse;
-   ManagerHandle *manager = NULL;
-
-   Data_Get_Struct(self, ManagerHandle, manager);
-   if(manager->handle != 0)
-   {
-      result = Qtrue;
-   }
-
-   return(result);
+VALUE isServiceManagerConnected(VALUE self) {
+  VALUE result   = Qfalse;
+  ManagerHandle *manager = NULL;
+
+  Data_Get_Struct(self, ManagerHandle, manager);
+  if(manager->handle != 0) {
+    result = Qtrue;
+  }
+
+  return(result);
 }
 
 
@@ -235,19 +222,16 @@ VALUE isServiceManagerConnected(VALUE self)
  * @return  A reference to the ServiceManager class.
  *
  */
-VALUE executeServiceTasks(int argc, VALUE *argv, VALUE self)
-{
-   if(argc > 0)
-   {
-      int i;
-
-      for(i = 0; i < argc; i++)
-      {
-         rb_funcall(argv[i], rb_intern("execute"), 1, self);
-      }
-   }
-
-   return(self);
+VALUE executeServiceTasks(int argc, VALUE *argv, VALUE self) {
+  if(argc > 0) {
+    int i;
+
+    for(i = 0; i < argc; i++) {
+      rb_funcall(argv[i], rb_intern("execute"), 1, self);
+    }
+  }
+
+  return(self);
 }
 
 
@@ -260,20 +244,17 @@ VALUE executeServiceTasks(int argc, VALUE *argv, VALUE self)
  *                  ServiceManager being collected.
  *
  */
-void serviceManagerFree(void *manager)
-{
-   if(manager != NULL)
-   {
-      ManagerHandle *handle = (ManagerHandle *)manager;
-
-      if(handle->handle != 0)
-      {
-         ISC_STATUS status[20];
-
-         isc_service_detach(status, &handle->handle);
-      }
-      free(handle);
-   }
+void serviceManagerFree(void *manager) {
+  if(manager != NULL) {
+    ManagerHandle *handle = (ManagerHandle *)manager;
+
+    if(handle->handle != 0) {
+      ISC_STATUS status[ISC_STATUS_LENGTH];
+
+      isc_service_detach(status, &handle->handle);
+    }
+    free(handle);
+  }
 }
 
 
@@ -287,13 +268,12 @@ void serviceManagerFree(void *manager)
  * @return  A reference to the newly created ServiceManager object.
  *
  */
-VALUE rb_service_manager_new(VALUE host)
-{
-   VALUE manager = allocateServiceManager(cServiceManager);
+VALUE rb_service_manager_new(VALUE host) {
+  VALUE manager = allocateServiceManager(cServiceManager);
 
-   initializeServiceManager(manager, host);
+  initializeServiceManager(manager, host);
 
-   return(manager);
+  return(manager);
 }
 
 
@@ -303,14 +283,13 @@ VALUE rb_service_manager_new(VALUE host)
  * @param  module  The module to create the new class definition under.
  *
  */
-void Init_ServiceManager(VALUE module)
-{
-   cServiceManager = rb_define_class_under(module, "ServiceManager", rb_cObject);
-   rb_define_alloc_func(cServiceManager, allocateServiceManager);
-   rb_define_method(cServiceManager, "initialize", initializeServiceManager, 1);
-   rb_define_method(cServiceManager, "initialize_copy", forbidObjectCopy, 1);
-   rb_define_method(cServiceManager, "connect", connectServiceManager, 2);
-   rb_define_method(cServiceManager, "disconnect", disconnectServiceManager, 0);
-   rb_define_method(cServiceManager, "connected?", isServiceManagerConnected, 0);
-   rb_define_method(cServiceManager, "execute", executeServiceTasks, -1);
+void Init_ServiceManager(VALUE module) {
+  cServiceManager = rb_define_class_under(module, "ServiceManager", rb_cObject);
+  rb_define_alloc_func(cServiceManager, allocateServiceManager);
+  rb_define_method(cServiceManager, "initialize", initializeServiceManager, 1);
+  rb_define_method(cServiceManager, "initialize_copy", forbidObjectCopy, 1);
+  rb_define_method(cServiceManager, "connect", connectServiceManager, 2);
+  rb_define_method(cServiceManager, "disconnect", disconnectServiceManager, 0);
+  rb_define_method(cServiceManager, "connected?", isServiceManagerConnected, 0);
+  rb_define_method(cServiceManager, "execute", executeServiceTasks, -1);
 }

data/ext/ServiceManager.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,7 +25,7 @@
 #ifndef FIRERUBY_SERVICE_MANAGER_H
 #define FIRERUBY_SERVICE_MANAGER_H
 
-   /* Includes. */
+/* Includes. */
    #ifndef FIRERUBY_FIRE_RUBY_H
       #include "FireRuby.h"
    #endif
@@ -33,16 +33,15 @@
    #ifndef FIRERUBY_FIRE_RUBY_EXCEPTION_H
       #include "FireRubyException.h"
    #endif
-   
-   /* Type definitions. */
-   typedef struct
-   {
-      isc_svc_handle handle;
-   } ManagerHandle;
-   
-   /* Function prototypes. */
-   void Init_ServiceManager(VALUE);
-   void serviceManagerFree(void *);
-   VALUE rb_service_manager_new(VALUE);
+
+/* Type definitions. */
+typedef struct {
+  isc_svc_handle handle;
+} ManagerHandle;
+
+/* Function prototypes. */
+void Init_ServiceManager(VALUE);
+void serviceManagerFree(void *);
+VALUE rb_service_manager_new(VALUE);
 
 #endif /* FIRERUBY_SERVICE_MANAGER_H */

data/ext/Services.c

@@ -45,81 +45,72 @@
  *          or nil if there is no output.
  *
  */
-VALUE queryService(isc_svc_handle *handle)
-{
-   VALUE result = Qnil;
-   int   size   = START_BUFFER_SIZE;
-   short done   = 0;
+VALUE queryService(isc_svc_handle *handle) {
+  VALUE result = Qnil;
+  int size   = START_BUFFER_SIZE;
+  short done   = 0;
 
-   /* Query the service until it has completed. */
-   while(!done)
-   {
-      ISC_STATUS status[20];
-      char       *output   = NULL,
-                 *offset   = NULL,
-                 *log      = NULL,
-                 request[] = {isc_info_svc_to_eof};
-      short      len       = 0;
+  /* Query the service until it has completed. */
+  while(!done) {
+    ISC_STATUS status[ISC_STATUS_LENGTH];
+    char       *output   = NULL,
+    *offset   = NULL,
+    *log      = NULL,
+                request[] = {isc_info_svc_to_eof};
+    short len       = 0;
 
-      /* Allocate the output buffer. */
-      offset = output = ALLOC_N(char, size);
-      if(output == NULL)
-      {
-         rb_raise(rb_eNoMemError,
-                  "Memory allocation failure querying service status.");
-      }
-      memset(output, 0, size);
+    /* Allocate the output buffer. */
+    offset = output = ALLOC_N(char, size);
+    if(output == NULL) {
+      rb_raise(rb_eNoMemError,
+               "Memory allocation failure querying service status.");
+    }
+    memset(output, 0, size);
 
-      /* Make the service info request. */
-      done = 1;
-      if(isc_service_query(status, handle, NULL, 0, NULL, sizeof(request),
-                           request, size, output))
-      {
-         free(output);
-         rb_fireruby_raise(status, "Error querying service status.");
-      }
+    /* Make the service info request. */
+    done = 1;
+    if(isc_service_query(status, handle, NULL, 0, NULL, sizeof(request),
+                         request, size, output)) {
+      free(output);
+      rb_fireruby_raise(status, "Error querying service status.");
+    }
 
-      do
-      {
-         switch(*offset++)
-         {
-            case isc_info_svc_to_eof :
-               len    = isc_vax_integer(offset, 2);
-               offset += 2;
-               if(len > 0)
-               {
-                  log = ALLOC_N(char, len + 1);
-                  if(log == NULL)
-                  {
-                     free(output);
-                     rb_raise(rb_eNoMemError,
-                              "Memory allocation failure querying service status.");
-                  }
+    do {
+      switch(*offset++) {
+      case isc_info_svc_to_eof:
+        len    = isc_vax_integer(offset, 2);
+        offset += 2;
+        if(len > 0) {
+          log = ALLOC_N(char, len + 1);
+          if(log == NULL) {
+            free(output);
+            rb_raise(rb_eNoMemError,
+                     "Memory allocation failure querying service status.");
+          }
 
-                  memset(log, 0, len + 1);
-                  memcpy(log, offset, len);
+          memset(log, 0, len + 1);
+          memcpy(log, offset, len);
 
-                  result = rb_str_new2(log);
-                  free(log);
-               }
-               break;
+          result = rb_str_new2(log);
+          free(log);
+        }
+        break;
 
-            case isc_info_truncated :
-               done = 0;
-               size = size * 2;
-               break;
-         }
-      } while(*offset);
+      case isc_info_truncated:
+        done = 0;
+        size = size * 2;
+        break;
+      }
+    } while(*offset);
 
-      /* Clean up. */
-      free(output);
+    /* Clean up. */
+    free(output);
 
-      /* Snooze if we're not done. */
-      if(!done)
-      {
-         rfb_sleep(1);
-      }
-   }
+    /* Snooze if we're not done. */
+    if(!done) {
+      rfb_sleep(1);
+    }
+  }
 
-   return(result);
+  return(result);
 }

data/ext/Services.h

@@ -25,7 +25,7 @@
 #ifndef FIRERUBY_SERVICES_H
 #define FIRERUBY_SERVICES_H
 
-   /* Includes. */
+/* Includes. */
    #ifndef IBASE_H_INCLUDED
       #include "ibase.h"
       #define IBASE_H_INCLUDED
@@ -36,7 +36,7 @@
       #define RUBY_H_INCLUDED
    #endif
 
-   /* Function prototypes. */
-   VALUE queryService(isc_svc_handle *);
+/* Function prototypes. */
+VALUE queryService(isc_svc_handle *);
 
 #endif /* FIRERUBY_SERVICES_H */