rubyfb 0.5.5 → 0.5.6

data/ext/Backup.c

@@ -79,37 +79,30 @@ VALUE cBackup;
  * @return  A reference to the newly initialized Backup object.
  *
  */
-VALUE initializeBackup(VALUE self, VALUE database, VALUE file)
-{
-   VALUE path  = Qnil,
-         files = rb_hash_new();
-
-   /* Extract the database file details. */
-   if(TYPE(database) == T_FILE)
-   {
-      path = rb_funcall(database, rb_intern("path"), 0);
-   }
-   else
-   {
-      path = rb_funcall(database, rb_intern("to_s"), 0);
-   }
-
-   /* Get the back file details. */
-   if(TYPE(file) == T_FILE)
-   {
-      rb_hash_aset(files, rb_funcall(file, rb_intern("path"), 0), Qnil);
-   }
-   else
-   {
-      rb_hash_aset(files, rb_funcall(file, rb_intern("to_s"), 0), Qnil);
-   }
-
-   rb_iv_set(self, "@database", path);
-   rb_iv_set(self, "@files", files);
-   rb_iv_set(self, "@options", rb_hash_new());
-   rb_iv_set(self, "@log", Qnil);
-
-   return(self);
+VALUE initializeBackup(VALUE self, VALUE database, VALUE file) {
+  VALUE path  = Qnil,
+        files = rb_hash_new();
+
+  /* Extract the database file details. */
+  if(TYPE(database) == T_FILE) {
+    path = rb_funcall(database, rb_intern("path"), 0);
+  } else {
+    path = rb_funcall(database, rb_intern("to_s"), 0);
+  }
+
+  /* Get the back file details. */
+  if(TYPE(file) == T_FILE) {
+    rb_hash_aset(files, rb_funcall(file, rb_intern("path"), 0), Qnil);
+  } else {
+    rb_hash_aset(files, rb_funcall(file, rb_intern("to_s"), 0), Qnil);
+  }
+
+  rb_iv_set(self, "@database", path);
+  rb_iv_set(self, "@files", files);
+  rb_iv_set(self, "@options", rb_hash_new());
+  rb_iv_set(self, "@log", Qnil);
+
+  return(self);
 }
 
 
@@ -122,11 +115,10 @@ VALUE initializeBackup(VALUE self, VALUE database, VALUE file)
  * @return  A reference to a String containing the backup file path/name.
  *
  */
-VALUE getBackupFile(VALUE self)
-{
-   VALUE files = rb_iv_get(self, "@files");
+VALUE getBackupFile(VALUE self) {
+  VALUE files = rb_iv_get(self, "@files");
 
-   return(rb_ary_entry(rb_funcall(files, rb_intern("keys"), 0), 0));
+  return(rb_ary_entry(rb_funcall(files, rb_intern("keys"), 0), 0));
 }
 
 
@@ -139,21 +131,17 @@ VALUE getBackupFile(VALUE self)
  *               of the backup file.
  *
  */
-VALUE setBackupFile(VALUE self, VALUE file)
-{
-   VALUE files = rb_hash_new();
-
-   if(TYPE(file) == T_FILE)
-   {
-      rb_hash_aset(files, rb_funcall(file, rb_intern("path"), 0), Qnil);
-   }
-   else
-   {
-      rb_hash_aset(files, rb_funcall(file, rb_intern("to_s"), 0), Qnil);
-   }
-   rb_iv_set(self, "@files", files);
-
-   return(self);
+VALUE setBackupFile(VALUE self, VALUE file) {
+  VALUE files = rb_hash_new();
+
+  if(TYPE(file) == T_FILE) {
+    rb_hash_aset(files, rb_funcall(file, rb_intern("path"), 0), Qnil);
+  } else {
+    rb_hash_aset(files, rb_funcall(file, rb_intern("to_s"), 0), Qnil);
+  }
+  rb_iv_set(self, "@files", files);
+
+  return(self);
 }
 
 
@@ -166,9 +154,8 @@ VALUE setBackupFile(VALUE self, VALUE file)
  *          database file to be backed up.
  *
  */
-VALUE getBackupDatabase(VALUE self)
-{
-   return(rb_iv_get(self, "@database"));
+VALUE getBackupDatabase(VALUE self) {
+  return(rb_iv_get(self, "@database"));
 }
 
 
@@ -182,18 +169,14 @@ VALUE getBackupDatabase(VALUE self)
  * @return  A reference to the Backup object that has been updated.
  *
  */
-VALUE setBackupDatabase(VALUE self, VALUE setting)
-{
-   if(TYPE(setting) == T_FILE)
-   {
-      rb_iv_set(self, "@database", rb_funcall(setting, rb_intern("path"), 0));
-   }
-   else
-   {
-      rb_iv_set(self, "@database", rb_funcall(setting, rb_intern("to_s"), 0));
-   }
-
-   return(self);
+VALUE setBackupDatabase(VALUE self, VALUE setting) {
+  if(TYPE(setting) == T_FILE) {
+    rb_iv_set(self, "@database", rb_funcall(setting, rb_intern("path"), 0));
+  } else {
+    rb_iv_set(self, "@database", rb_funcall(setting, rb_intern("to_s"), 0));
+  }
+
+  return(self);
 }
 
 
@@ -207,11 +190,10 @@ VALUE setBackupDatabase(VALUE self, VALUE setting)
  *          Backup object.
  *
  */
-VALUE getBackupBlockingFactor(VALUE self)
-{
-   VALUE options = rb_iv_get(self, "@options");
+VALUE getBackupBlockingFactor(VALUE self) {
+  VALUE options = rb_iv_get(self, "@options");
 
-   return(rb_hash_aref(options, INT2FIX(isc_spb_bkp_factor)));
+  return(rb_hash_aref(options, INT2FIX(isc_spb_bkp_factor)));
 }
 
 
@@ -226,17 +208,15 @@ VALUE getBackupBlockingFactor(VALUE self)
  * @return  A reference to the newly updated Backup object.
  *
  */
-VALUE setBackupBlockingFactor(VALUE self, VALUE setting)
-{
-   VALUE options = rb_iv_get(self, "@options");
+VALUE setBackupBlockingFactor(VALUE self, VALUE setting) {
+  VALUE options = rb_iv_get(self, "@options");
 
-   if(rb_obj_is_kind_of(setting, rb_cInteger) == Qfalse)
-   {
-      rb_fireruby_raise(NULL, "Invalid blocking factor specified for Backup.");
-   }
-   rb_hash_aset(options, INT2FIX(isc_spb_bkp_factor), setting);
+  if(rb_obj_is_kind_of(setting, rb_cInteger) == Qfalse) {
+    rb_fireruby_raise(NULL, "Invalid blocking factor specified for Backup.");
+  }
+  rb_hash_aset(options, INT2FIX(isc_spb_bkp_factor), setting);
 
-   return(self);
+  return(self);
 }
 
 
@@ -249,18 +229,16 @@ VALUE setBackupBlockingFactor(VALUE self, VALUE setting)
  * @return  Either true or false.
  *
  */
-VALUE getBackupIgnoreChecksums(VALUE self)
-{
-   VALUE result  = Qfalse,
-         options = rb_iv_get(self, "@options"),
-         value   = rb_hash_aref(options, IGNORE_CHECKSUMS);
-
-   if(value != Qnil)
-   {
-      result = value;
-   }
-
-   return(result);
+VALUE getBackupIgnoreChecksums(VALUE self) {
+  VALUE result  = Qfalse,
+        options = rb_iv_get(self, "@options"),
+        value   = rb_hash_aref(options, IGNORE_CHECKSUMS);
+
+  if(value != Qnil) {
+    result = value;
+  }
+
+  return(result);
 }
 
 
@@ -274,16 +252,14 @@ VALUE getBackupIgnoreChecksums(VALUE self)
  * @return  A reference to the newly updated Backup object.
  *
  */
-VALUE setBackupIgnoreChecksums(VALUE self, VALUE setting)
-{
-   VALUE options = rb_iv_get(self, "@options");
+VALUE setBackupIgnoreChecksums(VALUE self, VALUE setting) {
+  VALUE options = rb_iv_get(self, "@options");
 
-   if(setting == Qtrue || setting == Qfalse)
-   {
-      rb_hash_aset(options, IGNORE_CHECKSUMS, setting);
-   }
+  if(setting == Qtrue || setting == Qfalse) {
+    rb_hash_aset(options, IGNORE_CHECKSUMS, setting);
+  }
 
-   return(self);
+  return(self);
 }
 
 
@@ -296,18 +272,16 @@ VALUE setBackupIgnoreChecksums(VALUE self, VALUE setting)
  * @return  Either true or false.
  *
  */
-VALUE getBackupIgnoreLimbo(VALUE self)
-{
-   VALUE result  = Qfalse,
-         options = rb_iv_get(self, "@options"),
-         value   = rb_hash_aref(options, IGNORE_LIMBO);
-
-   if(value != Qnil)
-   {
-      result = value;
-   }
-
-   return(result);
+VALUE getBackupIgnoreLimbo(VALUE self) {
+  VALUE result  = Qfalse,
+        options = rb_iv_get(self, "@options"),
+        value   = rb_hash_aref(options, IGNORE_LIMBO);
+
+  if(value != Qnil) {
+    result = value;
+  }
+
+  return(result);
 }
 
 
@@ -321,16 +295,14 @@ VALUE getBackupIgnoreLimbo(VALUE self)
  * @return  A reference to the newly updated Backup object.
  *
  */
-VALUE setBackupIgnoreLimbo(VALUE self, VALUE setting)
-{
-   VALUE options = rb_iv_get(self, "@options");
+VALUE setBackupIgnoreLimbo(VALUE self, VALUE setting) {
+  VALUE options = rb_iv_get(self, "@options");
 
-   if(setting == Qtrue || setting == Qfalse)
-   {
-      rb_hash_aset(options, IGNORE_LIMBO, setting);
-   }
+  if(setting == Qtrue || setting == Qfalse) {
+    rb_hash_aset(options, IGNORE_LIMBO, setting);
+  }
 
-   return(self);
+  return(self);
 }
 
 
@@ -343,18 +315,16 @@ VALUE setBackupIgnoreLimbo(VALUE self, VALUE setting)
  * @return  Either true or false.
  *
  */
-VALUE getBackupMetadataOnly(VALUE self)
-{
-   VALUE result  = Qfalse,
-         options = rb_iv_get(self, "@options"),
-         value   = rb_hash_aref(options, METADATA_ONLY);
-
-   if(value != Qnil)
-   {
-      result = value;
-   }
-
-   return(result);
+VALUE getBackupMetadataOnly(VALUE self) {
+  VALUE result  = Qfalse,
+        options = rb_iv_get(self, "@options"),
+        value   = rb_hash_aref(options, METADATA_ONLY);
+
+  if(value != Qnil) {
+    result = value;
+  }
+
+  return(result);
 }
 
 
@@ -368,16 +338,14 @@ VALUE getBackupMetadataOnly(VALUE self)
  * @return  A reference to the newly updated Backup object.
  *
  */
-VALUE setBackupMetadataOnly(VALUE self, VALUE setting)
-{
-   VALUE options = rb_iv_get(self, "@options");
+VALUE setBackupMetadataOnly(VALUE self, VALUE setting) {
+  VALUE options = rb_iv_get(self, "@options");
 
-   if(setting == Qtrue || setting == Qfalse)
-   {
-      rb_hash_aset(options, METADATA_ONLY, setting);
-   }
+  if(setting == Qtrue || setting == Qfalse) {
+    rb_hash_aset(options, METADATA_ONLY, setting);
+  }
 
-   return(self);
+  return(self);
 }
 
 
@@ -390,18 +358,16 @@ VALUE setBackupMetadataOnly(VALUE self, VALUE setting)
  * @return  Either true or false.
  *
  */
-VALUE getBackupGarbageCollect(VALUE self)
-{
-   VALUE result  = Qtrue,
-         options = rb_iv_get(self, "@options"),
-         value   = rb_hash_aref(options, NO_GARBAGE_COLLECT);
-
-   if(value != Qnil)
-   {
-      result = value;
-   }
-
-   return(result);
+VALUE getBackupGarbageCollect(VALUE self) {
+  VALUE result  = Qtrue,
+        options = rb_iv_get(self, "@options"),
+        value   = rb_hash_aref(options, NO_GARBAGE_COLLECT);
+
+  if(value != Qnil) {
+    result = value;
+  }
+
+  return(result);
 }
 
 
@@ -415,16 +381,14 @@ VALUE getBackupGarbageCollect(VALUE self)
  * @return  A reference to the newly updated Backup object.
  *
  */
-VALUE setBackupGarbageCollect(VALUE self, VALUE setting)
-{
-   VALUE options = rb_iv_get(self, "@options");
+VALUE setBackupGarbageCollect(VALUE self, VALUE setting) {
+  VALUE options = rb_iv_get(self, "@options");
 
-   if(setting == Qtrue || setting == Qfalse)
-   {
-      rb_hash_aset(options, NO_GARBAGE_COLLECT, setting);
-   }
+  if(setting == Qtrue || setting == Qfalse) {
+    rb_hash_aset(options, NO_GARBAGE_COLLECT, setting);
+  }
 
-   return(self);
+  return(self);
 }
 
 
@@ -437,18 +401,16 @@ VALUE setBackupGarbageCollect(VALUE self, VALUE setting)
  * @return  Either true or false.
  *
  */
-VALUE getBackupNonTransportable(VALUE self)
-{
-   VALUE result  = Qfalse,
-         options = rb_iv_get(self, "@options"),
-         value   = rb_hash_aref(options, NON_TRANSPORTABLE);
-
-   if(value != Qnil)
-   {
-      result = value;
-   }
-
-   return(result);
+VALUE getBackupNonTransportable(VALUE self) {
+  VALUE result  = Qfalse,
+        options = rb_iv_get(self, "@options"),
+        value   = rb_hash_aref(options, NON_TRANSPORTABLE);
+
+  if(value != Qnil) {
+    result = value;
+  }
+
+  return(result);
 }
 
 
@@ -462,16 +424,14 @@ VALUE getBackupNonTransportable(VALUE self)
  * @return  A reference to the newly updated Backup object.
  *
  */
-VALUE setBackupNonTransportable(VALUE self, VALUE setting)
-{
-   VALUE options = rb_iv_get(self, "@options");
+VALUE setBackupNonTransportable(VALUE self, VALUE setting) {
+  VALUE options = rb_iv_get(self, "@options");
 
-   if(setting == Qtrue || setting == Qfalse)
-   {
-      rb_hash_aset(options, NON_TRANSPORTABLE, setting);
-   }
+  if(setting == Qtrue || setting == Qfalse) {
+    rb_hash_aset(options, NON_TRANSPORTABLE, setting);
+  }
 
-   return(self);
+  return(self);
 }
 
 
@@ -484,18 +444,16 @@ VALUE setBackupNonTransportable(VALUE self, VALUE setting)
  * @return  Either true or false.
  *
  */
-VALUE getBackupConvertTables(VALUE self)
-{
-   VALUE result  = Qfalse,
-         options = rb_iv_get(self, "@options"),
-         value   = rb_hash_aref(options, CONVERT_TABLES);
-
-   if(value != Qnil)
-   {
-      result = value;
-   }
-
-   return(result);
+VALUE getBackupConvertTables(VALUE self) {
+  VALUE result  = Qfalse,
+        options = rb_iv_get(self, "@options"),
+        value   = rb_hash_aref(options, CONVERT_TABLES);
+
+  if(value != Qnil) {
+    result = value;
+  }
+
+  return(result);
 }
 
 
@@ -509,16 +467,14 @@ VALUE getBackupConvertTables(VALUE self)
  * @return  A reference to the newly updated Backup object.
  *
  */
-VALUE setBackupConvertTables(VALUE self, VALUE setting)
-{
-   VALUE options = rb_iv_get(self, "@options");
+VALUE setBackupConvertTables(VALUE self, VALUE setting) {
+  VALUE options = rb_iv_get(self, "@options");
 
-   if(setting == Qtrue || setting == Qfalse)
-   {
-      rb_hash_aset(options, CONVERT_TABLES, setting);
-   }
+  if(setting == Qtrue || setting == Qfalse) {
+    rb_hash_aset(options, CONVERT_TABLES, setting);
+  }
 
-   return(self);
+  return(self);
 }
 
 
@@ -532,36 +488,33 @@ VALUE setBackupConvertTables(VALUE self, VALUE setting)
  * @return  A reference to the Backup object executed.
  *
  */
-VALUE executeBackup(VALUE self, VALUE manager)
-{
-   ManagerHandle *handle   = NULL;
-   short         length    = 0;
-   char          *buffer   = NULL;
-   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,
-                        "Database backup error. Service manager not connected.");
-   }
-
-   createBackupBuffer(rb_iv_get(self, "@database"), rb_iv_get(self, "@files"),
-                      rb_iv_get(self, "@options"), &buffer, &length);
-
-   /* Start the service request. */
-   if(isc_service_start(status, &handle->handle, NULL, length, buffer))
-   {
-      free(buffer);
-      rb_fireruby_raise(status, "Error performing database backup.");
-   }
-   free(buffer);
-
-   /* Query the service until it has completed. */
-   rb_iv_set(self, "@log", queryService(&handle->handle));
-
-   return(self);
+VALUE executeBackup(VALUE self, VALUE manager) {
+  ManagerHandle *handle   = NULL;
+  short length    = 0;
+  char          *buffer   = NULL;
+  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,
+                      "Database backup error. Service manager not connected.");
+  }
+
+  createBackupBuffer(rb_iv_get(self, "@database"), rb_iv_get(self, "@files"),
+                     rb_iv_get(self, "@options"), &buffer, &length);
+
+  /* Start the service request. */
+  if(isc_service_start(status, &handle->handle, NULL, length, buffer)) {
+    free(buffer);
+    rb_fireruby_raise(status, "Error performing database backup.");
+  }
+  free(buffer);
+
+  /* Query the service until it has completed. */
+  rb_iv_set(self, "@log", queryService(&handle->handle));
+
+  return(self);
 }
 
 
@@ -573,9 +526,8 @@ VALUE executeBackup(VALUE self, VALUE manager)
  * @return  A reference to the current log attribute value.
  *
  */
-VALUE getBackupLog(VALUE self)
-{
-   return(rb_iv_get(self, "@log"));
+VALUE getBackupLog(VALUE self) {
+  return(rb_iv_get(self, "@log"));
 }
 
 
@@ -597,158 +549,140 @@ VALUE getBackupLog(VALUE self)
  *
  */
 void createBackupBuffer(VALUE from, VALUE to, VALUE options, char **buffer,
-                        short *length)
-{
-   ID    id        = rb_intern("key?");
-   VALUE names     = rb_funcall(to, rb_intern("keys"), 0),
-         sizes     = rb_funcall(to, rb_intern("values"), 0),
-         count     = rb_funcall(names, rb_intern("size"), 0),
-         tmp_str   = Qnil;
-   char  *position = NULL;
-   short number,
-         flags     = 0,
-         extras    = 0,
-         blocking  = 0,
-         size      = TYPE(count) == T_FIXNUM ? FIX2INT(count) : NUM2INT(count),
-         i;
-
-   /* Check if extra options have been provided. */
-   if(TYPE(options) != T_NIL)
-   {
-      VALUE temp = rb_funcall(options, rb_intern("size"), 0);
-
-      extras = TYPE(temp) == T_FIXNUM ? FIX2INT(temp) : NUM2INT(temp);
-   }
-
-   /* Calculate the length needed for the buffer. */
-   *length = 2;
-   *length += strlen(StringValuePtr(from)) + 3;
-
-   /* Count file name and length sizes. */
-   for(i = 0; i < size; i++)
-   {
-      tmp_str = rb_ary_entry(names, i);
-      *length += strlen(StringValuePtr(tmp_str)) + 3;
-      if(i != size - 1)
-      {
-         VALUE num = rb_funcall(rb_ary_entry(sizes, i), rb_intern("to_s"), 0);
-
-         *length += strlen(StringValuePtr(num)) + 3;
-      }
-   }
-
-   if(extras)
-   {
-      if(rb_funcall(options, id, 1, INT2FIX(isc_spb_bkp_factor)) == Qtrue)
-      {
-         *length += 5;
-         blocking = 1;
-      }
-
-      if(rb_funcall(options, id, 1, IGNORE_CHECKSUMS) == Qtrue ||
-         rb_funcall(options, id, 1, IGNORE_LIMBO) == Qtrue ||
-         rb_funcall(options, id, 1, METADATA_ONLY) == Qtrue ||
-         rb_funcall(options, id, 1, NO_GARBAGE_COLLECT) == Qtrue ||
-         rb_funcall(options, id, 1, NON_TRANSPORTABLE) == Qtrue ||
-         rb_funcall(options, id, 1, CONVERT_TABLES) == Qtrue)
-      {
-         *length += 5;
-         flags   = 1;
-      }
-   }
-
-   /* Allocate the buffer. */
-   *buffer = position = ALLOC_N(char, *length);
-   if(*buffer == NULL)
-   {
-      rb_raise(rb_eNoMemError,
-               "Memory allocation error preparing database back up.");
-   }
-   memset(*buffer, 0, *length);
-
-   /* Populate the buffer. */
-   *position++ = isc_action_svc_backup;
-
-   *position++ = isc_spb_dbname;
-   number      = strlen(StringValuePtr(from));
-   ADD_SPB_LENGTH(position, number);
-   memcpy(position, StringValuePtr(from), number);
-   position += number;
-
-   for(i = 0; i < size; i++)
-   {
-      VALUE name = rb_ary_entry(names, i);
-
-      *position++ = isc_spb_bkp_file;
-      number      = strlen(StringValuePtr(name));
+                        short *length) {
+  ID id        = rb_intern("key?");
+  VALUE names     = rb_funcall(to, rb_intern("keys"), 0),
+        sizes     = rb_funcall(to, rb_intern("values"), 0),
+        count     = rb_funcall(names, rb_intern("size"), 0),
+        tmp_str   = Qnil;
+  char  *position = NULL;
+  short number,
+        flags     = 0,
+        extras    = 0,
+        blocking  = 0,
+        size      = TYPE(count) == T_FIXNUM ? FIX2INT(count) : NUM2INT(count),
+        i;
+
+  /* Check if extra options have been provided. */
+  if(TYPE(options) != T_NIL) {
+    VALUE temp = rb_funcall(options, rb_intern("size"), 0);
+
+    extras = TYPE(temp) == T_FIXNUM ? FIX2INT(temp) : NUM2INT(temp);
+  }
+
+  /* Calculate the length needed for the buffer. */
+  *length = 2;
+  *length += strlen(StringValuePtr(from)) + 3;
+
+  /* Count file name and length sizes. */
+  for(i = 0; i < size; i++) {
+    tmp_str = rb_ary_entry(names, i);
+    *length += strlen(StringValuePtr(tmp_str)) + 3;
+    if(i != size - 1) {
+      VALUE num = rb_funcall(rb_ary_entry(sizes, i), rb_intern("to_s"), 0);
+
+      *length += strlen(StringValuePtr(num)) + 3;
+    }
+  }
+
+  if(extras) {
+    if(rb_funcall(options, id, 1, INT2FIX(isc_spb_bkp_factor)) == Qtrue) {
+      *length += 5;
+      blocking = 1;
+    }
+
+    if(rb_funcall(options, id, 1, IGNORE_CHECKSUMS) == Qtrue ||
+       rb_funcall(options, id, 1, IGNORE_LIMBO) == Qtrue ||
+       rb_funcall(options, id, 1, METADATA_ONLY) == Qtrue ||
+       rb_funcall(options, id, 1, NO_GARBAGE_COLLECT) == Qtrue ||
+       rb_funcall(options, id, 1, NON_TRANSPORTABLE) == Qtrue ||
+       rb_funcall(options, id, 1, CONVERT_TABLES) == Qtrue) {
+      *length += 5;
+      flags   = 1;
+    }
+  }
+
+  /* Allocate the buffer. */
+  *buffer = position = ALLOC_N(char, *length);
+  if(*buffer == NULL) {
+    rb_raise(rb_eNoMemError,
+             "Memory allocation error preparing database back up.");
+  }
+  memset(*buffer, 0, *length);
+
+  /* Populate the buffer. */
+  *position++ = isc_action_svc_backup;
+
+  *position++ = isc_spb_dbname;
+  number      = strlen(StringValuePtr(from));
+  ADD_SPB_LENGTH(position, number);
+  memcpy(position, StringValuePtr(from), number);
+  position += number;
+
+  for(i = 0; i < size; i++) {
+    VALUE name = rb_ary_entry(names, i);
+
+    *position++ = isc_spb_bkp_file;
+    number      = strlen(StringValuePtr(name));
+    ADD_SPB_LENGTH(position, number);
+    memcpy(position, StringValuePtr(name), number);
+    position += number;
+
+    if(i != size - 1) {
+      VALUE max = rb_ary_entry(sizes, i);
+
+      max         = rb_funcall(max, rb_intern("to_s"), 0);
+      *position++ = isc_spb_bkp_length;
+      number      = strlen(StringValuePtr(max));
       ADD_SPB_LENGTH(position, number);
-      memcpy(position, StringValuePtr(name), number);
+      memcpy(position, StringValuePtr(max), number);
       position += number;
+    }
+  }
+
+  if(extras && blocking) {
+    VALUE key  = INT2FIX(isc_spb_bkp_factor),
+          temp = rb_funcall(options, rb_intern("fetch"), 1, key);
+    unsigned long size = TYPE(temp) == T_FIXNUM ? FIX2INT(temp) : NUM2INT(temp);
+
+    *position++ = isc_spb_bkp_factor;
+    memcpy(position, &size, 4);
+    position += 4;
+  }
+
+  if(extras && flags) {
+    unsigned long mask = 0;
+
+    if(rb_funcall(options, id, 1, IGNORE_CHECKSUMS) == Qtrue) {
+      mask |= isc_spb_bkp_ignore_checksums;
+    }
+
+    if(rb_funcall(options, id, 1, IGNORE_LIMBO) == Qtrue) {
+      mask |= isc_spb_bkp_ignore_limbo;
+    }
+
+    if(rb_funcall(options, id, 1, METADATA_ONLY) == Qtrue) {
+      mask |= isc_spb_bkp_metadata_only;
+    }
+
+    if(rb_funcall(options, id, 1, NO_GARBAGE_COLLECT) == Qtrue) {
+      mask |= isc_spb_bkp_no_garbage_collect;
+    }
+
+    if(rb_funcall(options, id, 1, NON_TRANSPORTABLE) == Qtrue) {
+      mask |= isc_spb_bkp_non_transportable;
+    }
+
+    if(rb_funcall(options, id, 1, CONVERT_TABLES) == Qtrue) {
+      mask |= isc_spb_bkp_convert;
+    }
+
+    *position++ = isc_spb_options;
+    memcpy(position, &mask, 4);
+    position += 4;
+  }
 
-      if(i != size - 1)
-      {
-         VALUE max = rb_ary_entry(sizes, i);
-
-         max         = rb_funcall(max, rb_intern("to_s"), 0);
-         *position++ = isc_spb_bkp_length;
-         number      = strlen(StringValuePtr(max));
-         ADD_SPB_LENGTH(position, number);
-         memcpy(position, StringValuePtr(max), number);
-         position += number;
-      }
-   }
-
-   if(extras && blocking)
-   {
-      VALUE         key  = INT2FIX(isc_spb_bkp_factor),
-                    temp = rb_funcall(options, rb_intern("fetch"), 1, key);
-      unsigned long size = TYPE(temp) == T_FIXNUM ? FIX2INT(temp) : NUM2INT(temp);
-
-      *position++ = isc_spb_bkp_factor;
-      memcpy(position, &size, 4);
-      position += 4;
-   }
-
-   if(extras && flags)
-   {
-      unsigned long mask = 0;
-
-      if(rb_funcall(options, id, 1, IGNORE_CHECKSUMS) == Qtrue)
-      {
-         mask |= isc_spb_bkp_ignore_checksums;
-      }
-
-      if(rb_funcall(options, id, 1, IGNORE_LIMBO) == Qtrue)
-      {
-         mask |= isc_spb_bkp_ignore_limbo;
-      }
-
-      if(rb_funcall(options, id, 1, METADATA_ONLY) == Qtrue)
-      {
-         mask |= isc_spb_bkp_metadata_only;
-      }
-
-      if(rb_funcall(options, id, 1, NO_GARBAGE_COLLECT) == Qtrue)
-      {
-         mask |= isc_spb_bkp_no_garbage_collect;
-      }
-
-      if(rb_funcall(options, id, 1, NON_TRANSPORTABLE) == Qtrue)
-      {
-         mask |= isc_spb_bkp_non_transportable;
-      }
-
-      if(rb_funcall(options, id, 1, CONVERT_TABLES) == Qtrue)
-      {
-         mask |= isc_spb_bkp_convert;
-      }
-
-      *position++ = isc_spb_options;
-      memcpy(position, &mask, 4);
-      position += 4;
-   }
-
-   *position++ = isc_spb_verbose;
+  *position++ = isc_spb_verbose;
 }
 
 
@@ -758,28 +692,27 @@ void createBackupBuffer(VALUE from, VALUE to, VALUE options, char **buffer,
  * @param  module  The module to create the new class definition under.
  *
  */
-void Init_Backup(VALUE module)
-{
-   cBackup = rb_define_class_under(module, "Backup", rb_cObject);
-   rb_define_method(cBackup, "initialize", initializeBackup, 2);
-   rb_define_method(cBackup, "backup_file", getBackupFile, 0);
-   rb_define_method(cBackup, "backup_file=", setBackupFile, 1);
-   rb_define_method(cBackup, "database", getBackupDatabase, 0);
-   rb_define_method(cBackup, "database=", setBackupDatabase, 1);
-   rb_define_method(cBackup, "blocking_factor", getBackupBlockingFactor, 0);
-   rb_define_method(cBackup, "blocking_factor=", setBackupBlockingFactor, 1);
-   rb_define_method(cBackup, "ignore_checksums", getBackupIgnoreChecksums, 0);
-   rb_define_method(cBackup, "ignore_checksums=", setBackupIgnoreChecksums, 1);
-   rb_define_method(cBackup, "ignore_limbo", getBackupIgnoreLimbo, 0);
-   rb_define_method(cBackup, "ignore_limbo=", setBackupIgnoreLimbo, 1);
-   rb_define_method(cBackup, "metadata_only", getBackupMetadataOnly, 0);
-   rb_define_method(cBackup, "metadata_only=", setBackupMetadataOnly, 1);
-   rb_define_method(cBackup, "garbage_collect", getBackupGarbageCollect, 0);
-   rb_define_method(cBackup, "garbage_collect=", setBackupGarbageCollect, 1);
-   rb_define_method(cBackup, "non_transportable", getBackupNonTransportable, 0);
-   rb_define_method(cBackup, "non_transportable=", setBackupNonTransportable, 1);
-   rb_define_method(cBackup, "convert_tables", getBackupConvertTables, 0);
-   rb_define_method(cBackup, "convert_tables=", setBackupConvertTables, 1);
-   rb_define_method(cBackup, "execute", executeBackup, 1);
-   rb_define_method(cBackup, "log", getBackupLog, 0);
+void Init_Backup(VALUE module) {
+  cBackup = rb_define_class_under(module, "Backup", rb_cObject);
+  rb_define_method(cBackup, "initialize", initializeBackup, 2);
+  rb_define_method(cBackup, "backup_file", getBackupFile, 0);
+  rb_define_method(cBackup, "backup_file=", setBackupFile, 1);
+  rb_define_method(cBackup, "database", getBackupDatabase, 0);
+  rb_define_method(cBackup, "database=", setBackupDatabase, 1);
+  rb_define_method(cBackup, "blocking_factor", getBackupBlockingFactor, 0);
+  rb_define_method(cBackup, "blocking_factor=", setBackupBlockingFactor, 1);
+  rb_define_method(cBackup, "ignore_checksums", getBackupIgnoreChecksums, 0);
+  rb_define_method(cBackup, "ignore_checksums=", setBackupIgnoreChecksums, 1);
+  rb_define_method(cBackup, "ignore_limbo", getBackupIgnoreLimbo, 0);
+  rb_define_method(cBackup, "ignore_limbo=", setBackupIgnoreLimbo, 1);
+  rb_define_method(cBackup, "metadata_only", getBackupMetadataOnly, 0);
+  rb_define_method(cBackup, "metadata_only=", setBackupMetadataOnly, 1);
+  rb_define_method(cBackup, "garbage_collect", getBackupGarbageCollect, 0);
+  rb_define_method(cBackup, "garbage_collect=", setBackupGarbageCollect, 1);
+  rb_define_method(cBackup, "non_transportable", getBackupNonTransportable, 0);
+  rb_define_method(cBackup, "non_transportable=", setBackupNonTransportable, 1);
+  rb_define_method(cBackup, "convert_tables", getBackupConvertTables, 0);
+  rb_define_method(cBackup, "convert_tables=", setBackupConvertTables, 1);
+  rb_define_method(cBackup, "execute", executeBackup, 1);
+  rb_define_method(cBackup, "log", getBackupLog, 0);
 }