rubyfb 0.5.5 → 0.5.6

data/ext/Generator.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_GENERATOR_H
 #define FIRERUBY_GENERATOR_H
 
-   /* Includes. */
+/* Includes. */
    #ifndef FIRERUBY_FIRE_RUBY_EXCEPTION_H
       #include "FireRubyException.h"
    #endif
@@ -33,21 +33,20 @@
    #ifndef FIRERUBY_CONNECTION_H
       #include "Connection.h"
    #endif
-   
+
    #ifndef RUBY_H_INCLUDED
       #include "ruby.h"
       #define RUBY_H_INCLUDED
    #endif
-   
-   /* Type definitions. */
-   typedef struct
-   {
-      isc_db_handle *connection;
-   } GeneratorHandle;
 
-   /* Function prototypes. */
-   void Init_Generator(VALUE);
-   VALUE rb_generator_new(VALUE, VALUE);
-   void generatorFree(void *);
+/* Type definitions. */
+typedef struct {
+  isc_db_handle *connection;
+} GeneratorHandle;
+
+/* Function prototypes. */
+void Init_Generator(VALUE);
+VALUE rb_generator_new(VALUE, VALUE);
+void generatorFree(void *);
 
 #endif /* FIRERUBY_GENERATOR_H */

data/ext/RemoveUser.c

@@ -29,7 +29,7 @@
 #include "ServiceManager.h"
 
 /* Function prototypes. */
-static VALUE initializeRemoveUser(VALUE , VALUE);
+static VALUE initializeRemoveUser(VALUE, VALUE);
 static VALUE getUserName(VALUE);
 static VALUE setUserName(VALUE, VALUE);
 static void createRemoveUserBuffer(VALUE, char **, short *);
@@ -49,26 +49,24 @@ VALUE cRemoveUser;
  * @return  A reference to the newly initialized RemoveUser object.
  *
  */
-VALUE initializeRemoveUser(VALUE self, VALUE username)
-{
-   VALUE actual = rb_funcall(username, rb_intern("to_s"), 0),
-         value  = Qnil;
-   int   length = 0;
-         
-   /* Check that the parameters are valid. */
-   value  = rb_funcall(actual, rb_intern("length"), 0);
-   length = TYPE(value) == T_FIXNUM ? FIX2INT(value) : NUM2INT(value);
-   if(length < 1 || length > 31)
-   {
-      rb_fireruby_raise(NULL,
-                        "Invalid user name specified. A user name must not be "\
-                        "blank and may have no more than 31 characters.");
-   }
-
-   /* Assign class values. */
-   rb_iv_set(self, "@user_name", actual);
-   
-   return(self);
+VALUE initializeRemoveUser(VALUE self, VALUE username) {
+  VALUE actual = rb_funcall(username, rb_intern("to_s"), 0),
+        value  = Qnil;
+  int length = 0;
+
+  /* Check that the parameters are valid. */
+  value  = rb_funcall(actual, rb_intern("length"), 0);
+  length = TYPE(value) == T_FIXNUM ? FIX2INT(value) : NUM2INT(value);
+  if(length < 1 || length > 31) {
+    rb_fireruby_raise(NULL,
+                      "Invalid user name specified. A user name must not be " \
+                      "blank and may have no more than 31 characters.");
+  }
+
+  /* Assign class values. */
+  rb_iv_set(self, "@user_name", actual);
+
+  return(self);
 }
 
 
@@ -81,9 +79,8 @@ VALUE initializeRemoveUser(VALUE self, VALUE username)
  * @return  A reference to the attribute value for the object.
  *
  */
-VALUE getUserName(VALUE self)
-{
-   return(rb_iv_get(self, "@user_name"));
+VALUE getUserName(VALUE self) {
+  return(rb_iv_get(self, "@user_name"));
 }
 
 
@@ -97,22 +94,20 @@ VALUE getUserName(VALUE self)
  * @return  A reference to the newly update RemoveUser object.
  *
  */
-VALUE setUserName(VALUE self, VALUE setting)
-{
-   VALUE actual = rb_funcall(setting, rb_intern("to_s"), 0),
-         value  = rb_funcall(actual, rb_intern("length"), 0);
-   int   length = 0;
-   
-   length = TYPE(value) == T_FIXNUM ? FIX2INT(value) : NUM2INT(value);
-   if(length < 1 || length > 31)
-   {
-      rb_fireruby_raise(NULL,
-                        "Invalid user name specified. A user name must not be "\
-                        "blank and may have no more than 31 characters.");
-   }
-   rb_iv_set(self, "@user_name", actual);
-   
-   return(self);
+VALUE setUserName(VALUE self, VALUE setting) {
+  VALUE actual = rb_funcall(setting, rb_intern("to_s"), 0),
+        value  = rb_funcall(actual, rb_intern("length"), 0);
+  int length = 0;
+
+  length = TYPE(value) == T_FIXNUM ? FIX2INT(value) : NUM2INT(value);
+  if(length < 1 || length > 31) {
+    rb_fireruby_raise(NULL,
+                      "Invalid user name specified. A user name must not be " \
+                      "blank and may have no more than 31 characters.");
+  }
+  rb_iv_set(self, "@user_name", actual);
+
+  return(self);
 }
 
 
@@ -127,32 +122,29 @@ VALUE setUserName(VALUE self, VALUE setting)
  * @return  A reference to the RemoveUser object executed.
  *
  */
-VALUE executeRemoveUser(VALUE self, VALUE manager)
-{
-   ManagerHandle *handle = NULL;
-   char          *buffer  = NULL;
-   short         length   = 0;
-   ISC_STATUS    status[20];
-
-   /* Check that the service manager is connected. */
-   Data_Get_Struct(manager, ManagerHandle, handle);
-   if(handle->handle == 0)
-   {
-      rb_fireruby_raise(NULL,
-                        "Remove user error. Service manager not connected.");
-   }
-
-   createRemoveUserBuffer(self, &buffer, &length);
-
-   /* Start the service request. */
-   if(isc_service_start(status, &handle->handle, NULL, length, buffer))
-   {
-      free(buffer);
-      rb_fireruby_raise(status, "Error removing user.");
-   }
-   free(buffer);
-
-   return(self);
+VALUE executeRemoveUser(VALUE self, VALUE manager) {
+  ManagerHandle *handle = NULL;
+  char          *buffer  = NULL;
+  short length   = 0;
+  ISC_STATUS status[ISC_STATUS_LENGTH];
+
+  /* Check that the service manager is connected. */
+  Data_Get_Struct(manager, ManagerHandle, handle);
+  if(handle->handle == 0) {
+    rb_fireruby_raise(NULL,
+                      "Remove user error. Service manager not connected.");
+  }
+
+  createRemoveUserBuffer(self, &buffer, &length);
+
+  /* Start the service request. */
+  if(isc_service_start(status, &handle->handle, NULL, length, buffer)) {
+    free(buffer);
+    rb_fireruby_raise(status, "Error removing user.");
+  }
+  free(buffer);
+
+  return(self);
 }
 
 
@@ -166,35 +158,33 @@ VALUE executeRemoveUser(VALUE self, VALUE manager)
  *                 of the buffer.
  *
  */
-void createRemoveUserBuffer(VALUE self, char **buffer, short *length)
-{
-   VALUE value   = Qnil,
-         tmp_str = Qnil;
-   char  *offset = NULL;
-   int   number  = 0;
-   
-   /* Calculate the required buffer length. */
-   *length = 1;
-   tmp_str = rb_iv_get(self, "@user_name");
-   *length += strlen(StringValuePtr(tmp_str)) + 3;
-   
-   /* Create and populate the buffer. */
-   offset = *buffer = ALLOC_N(char, *length);
-   if(*buffer == NULL)
-   {
-      rb_raise(rb_eNoMemError,
-               "Memory allocation error preparing to remove user.");
-   }
-   memset(*buffer, 0, *length);
-
-   *offset++ = isc_action_svc_delete_user;
-   
-   *offset++ = isc_spb_sec_username;
-   value     = rb_iv_get(self, "@user_name");
-   number    = strlen(StringValuePtr(value));
-   ADD_SPB_LENGTH(offset, number);
-   memcpy(offset, StringValuePtr(value), number);
-   offset    += number;
+void createRemoveUserBuffer(VALUE self, char **buffer, short *length) {
+  VALUE value   = Qnil,
+        tmp_str = Qnil;
+  char  *offset = NULL;
+  int number  = 0;
+
+  /* Calculate the required buffer length. */
+  *length = 1;
+  tmp_str = rb_iv_get(self, "@user_name");
+  *length += strlen(StringValuePtr(tmp_str)) + 3;
+
+  /* Create and populate the buffer. */
+  offset = *buffer = ALLOC_N(char, *length);
+  if(*buffer == NULL) {
+    rb_raise(rb_eNoMemError,
+             "Memory allocation error preparing to remove user.");
+  }
+  memset(*buffer, 0, *length);
+
+  *offset++ = isc_action_svc_delete_user;
+
+  *offset++ = isc_spb_sec_username;
+  value     = rb_iv_get(self, "@user_name");
+  number    = strlen(StringValuePtr(value));
+  ADD_SPB_LENGTH(offset, number);
+  memcpy(offset, StringValuePtr(value), number);
+  offset    += number;
 }
 
 
@@ -204,11 +194,10 @@ void createRemoveUserBuffer(VALUE self, char **buffer, short *length)
  * @param  module  The module to create the new class definition under.
  *
  */
-void Init_RemoveUser(VALUE module)
-{
-   cRemoveUser = rb_define_class_under(module, "RemoveUser", rb_cObject);
-   rb_define_method(cRemoveUser, "initialize", initializeRemoveUser, 1);
-   rb_define_method(cRemoveUser, "user_name", getUserName, 0);
-   rb_define_method(cRemoveUser, "user_name=", setUserName, 1);
-   rb_define_method(cRemoveUser, "execute", executeRemoveUser, 1);
+void Init_RemoveUser(VALUE module) {
+  cRemoveUser = rb_define_class_under(module, "RemoveUser", rb_cObject);
+  rb_define_method(cRemoveUser, "initialize", initializeRemoveUser, 1);
+  rb_define_method(cRemoveUser, "user_name", getUserName, 0);
+  rb_define_method(cRemoveUser, "user_name=", setUserName, 1);
+  rb_define_method(cRemoveUser, "execute", executeRemoveUser, 1);
 }

data/ext/RemoveUser.h

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