mysql2 0.3.11-x86-mswin32-60 → 0.3.18-x86-mswin32-60

data/ext/mysql2/client.h

@@ -1,24 +1,30 @@
 #ifndef MYSQL2_CLIENT_H
 #define MYSQL2_CLIENT_H
 
+#ifndef HAVE_RB_THREAD_CALL_WITHOUT_GVL
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+
+/* emulate rb_thread_call_without_gvl with rb_thread_blocking_region */
+#define rb_thread_call_without_gvl(func, data1, ubf, data2) \
+  rb_thread_blocking_region((rb_blocking_function_t *)func, data1, ubf, data2)
+
+#else /* ! HAVE_RB_THREAD_BLOCKING_REGION */
 /*
- * partial emulation of the 1.9 rb_thread_blocking_region under 1.8,
+ * partial emulation of the 2.0 rb_thread_call_without_gvl under 1.8,
  * this is enough for dealing with blocking I/O functions in the
  * presence of threads.
  */
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
 
 #include <rubysig.h>
 #define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
 typedef void rb_unblock_function_t(void *);
-typedef VALUE rb_blocking_function_t(void *);
-static VALUE
-rb_thread_blocking_region(
-  rb_blocking_function_t *func, void *data1,
+static void *
+rb_thread_call_without_gvl(
+   void *(*func)(void *), void *data1,
   RB_MYSQL_UNUSED rb_unblock_function_t *ubf,
   RB_MYSQL_UNUSED void *data2)
 {
-  VALUE rv;
+  void *rv;
 
   TRAP_BEG;
   rv = func(data1);
@@ -28,15 +34,23 @@ rb_thread_blocking_region(
 }
 
 #endif /* ! HAVE_RB_THREAD_BLOCKING_REGION */
-
-void init_mysql2_client();
+#endif /* ! HAVE_RB_THREAD_CALL_WITHOUT_GVL */
 
 typedef struct {
   VALUE encoding;
-  int active;
+  VALUE active_thread; /* rb_thread_current() or Qnil */
+  long server_version;
   int reconnect_enabled;
-  int closed;
+  unsigned int connect_timeout;
+  int active;
+  int connected;
+  int initialized;
+  int refcount;
+  int freed;
   MYSQL *client;
 } mysql_client_wrapper;
 
-#endif
+void init_mysql2_client();
+void decr_mysql2_client(mysql_client_wrapper *wrapper);
+
+#endif

data/ext/mysql2/extconf.rb

@@ -5,9 +5,14 @@ def asplode lib
   abort "-----\n#{lib} is missing.  please check your installation of mysql and try again.\n-----"
 end
 
+# 2.0-only
+have_header('ruby/thread.h') && have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
+
 # 1.9-only
 have_func('rb_thread_blocking_region')
 have_func('rb_wait_for_single_fd')
+have_func('rb_hash_dup')
+have_func('rb_intern3')
 
 # borrowed from mysqlplus
 # http://github.com/oldmoe/mysqlplus/blob/master/ext/extconf.rb
@@ -15,30 +20,50 @@ dirs = ENV['PATH'].split(File::PATH_SEPARATOR) + %w[
   /opt
   /opt/local
   /opt/local/mysql
-  /opt/local/lib/mysql5
+  /opt/local/lib/mysql5*
   /usr
+  /usr/mysql
   /usr/local
   /usr/local/mysql
   /usr/local/mysql-*
-  /usr/local/lib/mysql5
+  /usr/local/lib/mysql5*
 ].map{|dir| "#{dir}/bin" }
 
 GLOB = "{#{dirs.join(',')}}/{mysql_config,mysql_config5}"
 
-if RUBY_PLATFORM =~ /mswin|mingw/
-  inc, lib = dir_config('mysql')
-  exit 1 unless have_library("libmysql")
-elsif mc = (with_config('mysql-config') || Dir[GLOB].first) then
+# If the user has provided a --with-mysql-dir argument, we must respect it or fail.
+inc, lib = dir_config('mysql')
+if inc && lib
+  # Ruby versions not incorporating the mkmf fix at
+  # https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39717
+  # do not properly search for lib directories, and must be corrected
+  unless lib && lib[-3, 3] == 'lib'
+    @libdir_basename = 'lib'
+    inc, lib = dir_config('mysql')
+  end
+  abort "-----\nCannot find include dir(s) #{inc}\n-----" unless inc && inc.split(File::PATH_SEPARATOR).any?{|dir| File.directory?(dir)}
+  abort "-----\nCannot find library dir(s) #{lib}\n-----" unless lib && lib.split(File::PATH_SEPARATOR).any?{|dir| File.directory?(dir)}
+  warn  "-----\nUsing --with-mysql-dir=#{File.dirname inc}\n-----"
+  rpath_dir = lib
+elsif mc = (with_config('mysql-config') || Dir[GLOB].first)
+  # If the user has provided a --with-mysql-config argument, we must respect it or fail.
+  # If the user gave --with-mysql-config with no argument means we should try to find it.
   mc = Dir[GLOB].first if mc == true
-  cflags = `#{mc} --cflags`.chomp
+  abort "-----\nCannot find mysql_config at #{mc}\n-----" unless mc && File.exists?(mc)
+  abort "-----\nCannot execute mysql_config at #{mc}\n-----" unless File.executable?(mc)
+  warn  "-----\nUsing mysql_config at #{mc}\n-----"
+  ver = `#{mc} --version`.chomp.to_f
+  includes = `#{mc} --include`.chomp
   exit 1 if $? != 0
   libs = `#{mc} --libs_r`.chomp
-  if libs.empty?
+  # MySQL 5.5 and above already have re-entrant code in libmysqlclient (no _r).
+  if ver >= 5.5 || libs.empty?
     libs = `#{mc} --libs`.chomp
   end
   exit 1 if $? != 0
-  $CPPFLAGS += ' ' + cflags
+  $INCFLAGS += ' ' + includes
   $libs = libs + " " + $libs
+  rpath_dir = libs
 else
   inc, lib = dir_config('mysql', '/usr/local')
   libs = ['m', 'z', 'socket', 'nsl', 'mygcc']
@@ -46,11 +71,12 @@ else
     exit 1 if libs.empty?
     have_library(libs.shift)
   end
+  rpath_dir = lib
 end
 
-if have_header('mysql.h') then
+if have_header('mysql.h')
   prefix = nil
-elsif have_header('mysql/mysql.h') then
+elsif have_header('mysql/mysql.h')
   prefix = 'mysql'
 else
   asplode 'mysql.h'
@@ -61,13 +87,91 @@ end
   asplode h unless have_header h
 end
 
-unless RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /sparc/
-  $CFLAGS << ' -Wall -funroll-loops'
+# These gcc style flags are also supported by clang and xcode compilers,
+# so we'll use a does-it-work test instead of an is-it-gcc test.
+gcc_flags = ' -Wall -funroll-loops'
+if try_link('int main() {return 0;}', gcc_flags)
+  $CFLAGS << gcc_flags
 end
-# $CFLAGS << ' -O0 -ggdb3 -Wextra'
 
-if hard_mysql_path = $libs[%r{-L(/[^ ]+)}, 1]
-	$LDFLAGS << " -Wl,-rpath,#{hard_mysql_path}"
+if RUBY_PLATFORM =~ /mswin|mingw/
+  # Build libmysql.a interface link library
+  require 'rake'
+
+  # Build libmysql.a interface link library
+  # Use rake to rebuild only if these files change
+  deffile = File.expand_path('../../../support/libmysql.def', __FILE__)
+  libfile = File.expand_path(File.join(rpath_dir, 'libmysql.lib'))
+  file 'libmysql.a' => [deffile, libfile] do |t|
+    when_writing 'building libmysql.a' do
+      # Ruby kindly shows us where dllwrap is, but that tool does more than we want.
+      # Maybe in the future Ruby could provide RbConfig::CONFIG['DLLTOOL'] directly.
+      dlltool = RbConfig::CONFIG['DLLWRAP'].gsub('dllwrap', 'dlltool')
+      sh dlltool, '--kill-at',
+         '--dllname', 'libmysql.dll',
+         '--output-lib', 'libmysql.a',
+         '--input-def', deffile, libfile
+    end
+  end
+
+  Rake::Task['libmysql.a'].invoke
+  $LOCAL_LIBS << ' ' << 'libmysql.a'
+
+  # Make sure the generated interface library works (if cross-compiling, trust without verifying)
+  unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+    abort "-----\nCannot find libmysql.a\n----" unless have_library('libmysql')
+    abort "-----\nCannot link to libmysql.a (my_init)\n----" unless have_func('my_init')
+  end
+
+  # Vendor libmysql.dll
+  vendordir = File.expand_path('../../../vendor/', __FILE__)
+  directory vendordir
+
+  vendordll = File.join(vendordir, 'libmysql.dll')
+  dllfile = File.expand_path(File.join(rpath_dir, 'libmysql.dll'))
+  file vendordll => [dllfile, vendordir] do |t|
+    when_writing 'copying libmysql.dll' do
+      cp dllfile, vendordll
+    end
+  end
+
+  # Copy libmysql.dll to the local vendor directory by default
+  if arg_config('--no-vendor-libmysql')
+    # Fine, don't.
+    puts "--no-vendor-libmysql"
+  else # Default: arg_config('--vendor-libmysql')
+    # Let's do it!
+    Rake::Task[vendordll].invoke
+  end
+else
+  case explicit_rpath = with_config('mysql-rpath')
+  when true
+    abort "-----\nOption --with-mysql-rpath must have an argument\n-----"
+  when false
+    warn "-----\nOption --with-mysql-rpath has been disabled at your request\n-----"
+  when String
+    # The user gave us a value so use it
+    rpath_flags = " -Wl,-rpath,#{explicit_rpath}"
+    warn "-----\nSetting mysql rpath to #{explicit_rpath}\n-----"
+    $LDFLAGS << rpath_flags
+  else
+    if libdir = rpath_dir[%r{(-L)?(/[^ ]+)}, 2]
+      rpath_flags = " -Wl,-rpath,#{libdir}"
+      if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', rpath_flags)
+        # Usually Ruby sets RPATHFLAG the right way for each system, but not on OS X.
+        warn "-----\nSetting rpath to #{libdir}\n-----"
+        $LDFLAGS << rpath_flags
+      else
+        if RbConfig::CONFIG["RPATHFLAG"].to_s.empty?
+          # If we got here because try_link failed, warn the user
+          warn "-----\nDon't know how to set rpath on your system, if MySQL libraries are not in path mysql2 may not load\n-----"
+        end
+        # Make sure that LIBPATH gets set if we didn't explicitly set the rpath.
+        warn "-----\nSetting libpath to #{libdir}\n-----"
+        $LIBPATH << libdir unless $LIBPATH.include?(libdir)
+      end
+    end
+  end
 end
 
 create_makefile('mysql2/mysql2')

data/ext/mysql2/infile.c

@@ -0,0 +1,122 @@
+#include <mysql2_ext.h>
+
+#include <errno.h>
+#ifndef _MSC_VER
+#include <unistd.h>
+#endif
+#include <fcntl.h>
+
+#define ERROR_LEN 1024
+typedef struct
+{
+  int fd;
+  char *filename;
+  char error[ERROR_LEN];
+  mysql_client_wrapper *wrapper;
+} mysql2_local_infile_data;
+
+/* MySQL calls this function when a user begins a LOAD DATA LOCAL INFILE query.
+ *
+ * Allocate a data struct and pass it back through the data pointer.
+ *
+ * Returns:
+ * 0 on success
+ * 1 on error
+ */
+static int
+mysql2_local_infile_init(void **ptr, const char *filename, void *userdata)
+{
+  mysql2_local_infile_data *data = malloc(sizeof(mysql2_local_infile_data));
+  if (!data) return 1;
+
+  *ptr = data;
+  data->error[0] = 0;
+  data->wrapper = userdata;
+
+  data->filename = strdup(filename);
+  if (!data->filename) {
+    snprintf(data->error, ERROR_LEN, "%s: %s", strerror(errno), filename);
+    return 1;
+  }
+
+  data->fd = open(filename, O_RDONLY);
+  if (data->fd < 0) {
+    snprintf(data->error, ERROR_LEN, "%s: %s", strerror(errno), filename);
+    return 1;
+  }
+
+  return 0;
+}
+
+/* MySQL calls this function to read data from the local file.
+ *
+ * Returns:
+ * > 0   number of bytes read
+ * == 0  end of file
+ * < 0   error
+ */
+static int
+mysql2_local_infile_read(void *ptr, char *buf, uint buf_len)
+{
+  int count;
+  mysql2_local_infile_data *data = (mysql2_local_infile_data *)ptr;
+
+  count = (int)read(data->fd, buf, buf_len);
+  if (count < 0) {
+    snprintf(data->error, ERROR_LEN, "%s: %s", strerror(errno), data->filename);
+  }
+
+  return count;
+}
+
+/* MySQL calls this function when we're done with the LOCAL INFILE query.
+ *
+ * ptr will be null if the init function failed.
+ */
+static void
+mysql2_local_infile_end(void *ptr)
+{
+  mysql2_local_infile_data *data = (mysql2_local_infile_data *)ptr;
+  if (data) {
+    if (data->fd >= 0)
+      close(data->fd);
+    if (data->filename)
+      free(data->filename);
+    free(data);
+  }
+}
+
+/* MySQL calls this function if any of the functions above returned an error.
+ *
+ * This function is called even if init failed, with whatever ptr value
+ * init has set, regardless of the return value of the init function.
+ *
+ * Returns:
+ * Error message number (see http://dev.mysql.com/doc/refman/5.0/en/error-messages-client.html)
+ */
+static int
+mysql2_local_infile_error(void *ptr, char *error_msg, uint error_msg_len)
+{
+  mysql2_local_infile_data *data = (mysql2_local_infile_data *) ptr;
+
+  if (data) {
+    snprintf(error_msg, error_msg_len, "%s", data->error);
+    return CR_UNKNOWN_ERROR;
+  }
+
+  snprintf(error_msg, error_msg_len, "Out of memory");
+  return CR_OUT_OF_MEMORY;
+}
+
+/* Tell MySQL Client to use our own local_infile functions.
+ * This is both due to bugginess in the default handlers,
+ * and to improve the Rubyness of the handlers here.
+ */
+void mysql2_set_local_infile(MYSQL *mysql, void *userdata)
+{
+  mysql_set_local_infile_handler(mysql,
+                                 mysql2_local_infile_init,
+                                 mysql2_local_infile_read,
+                                 mysql2_local_infile_end,
+                                 mysql2_local_infile_error, userdata);
+}

data/ext/mysql2/infile.h

@@ -0,0 +1 @@
+void mysql2_set_local_infile(MYSQL *mysql, void *userdata);

data/ext/mysql2/mysql2_ext.h

@@ -1,12 +1,11 @@
 #ifndef MYSQL2_EXT
 #define MYSQL2_EXT
 
-// tell rbx not to use it's caching compat layer
-// by doing this we're making a promize to RBX that
-// we'll never modify the pointers we get back from RSTRING_PTR
+/* tell rbx not to use it's caching compat layer
+   by doing this we're making a promise to RBX that
+   we'll never modify the pointers we get back from RSTRING_PTR */
 #define RSTRING_NOT_MODIFIED
 #include <ruby.h>
-#include <fcntl.h>
 
 #ifndef HAVE_UINT
 #define HAVE_UINT
@@ -29,6 +28,9 @@ typedef unsigned int    uint;
 #ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/encoding.h>
 #endif
+#ifdef HAVE_RUBY_THREAD_H
+#include <ruby/thread.h>
+#endif
 
 #if defined(__GNUC__) && (__GNUC__ >= 3)
 #define RB_MYSQL_UNUSED __attribute__ ((unused))
@@ -38,5 +40,6 @@ typedef unsigned int    uint;
 
 #include <client.h>
 #include <result.h>
+#include <infile.h>
 
 #endif

data/ext/mysql2/mysql_enc_name_to_ruby.h

@@ -0,0 +1,168 @@
+/* C code produced by gperf version 3.0.3 */
+/* Command-line: gperf  */
+/* Computed positions: -k'1,3,$' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+struct mysql2_mysql_enc_name_to_rb_map { const char *name; const char *rb_name; };
+/* maximum key range = 66, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+mysql2_mysql_enc_name_to_rb_hash (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static const unsigned char asso_values[] =
+    {
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 40,  5,
+       0, 69,  0, 40, 25, 20, 10, 55, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 35,  5,  0,
+      10,  0, 20,  0,  5,  5, 69,  0, 10, 15,
+       0,  0, 69, 69, 25,  5,  5,  0, 69, 30,
+      69,  0, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+      69, 69, 69, 69, 69, 69
+    };
+  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]] + asso_values[(unsigned char)str[len - 1]];
+}
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct mysql2_mysql_enc_name_to_rb_map *
+mysql2_mysql_enc_name_to_rb (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  enum
+    {
+      TOTAL_KEYWORDS = 39,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 8,
+      MIN_HASH_VALUE = 3,
+      MAX_HASH_VALUE = 68
+    };
+
+  static const struct mysql2_mysql_enc_name_to_rb_map wordlist[] =
+    {
+      {""}, {""}, {""},
+      {"gbk", "GBK"},
+      {""},
+      {"greek", "ISO-8859-7"},
+      {"gb2312", "GB2312"},
+      {"keybcs2", NULL},
+      {""},
+      {"ucs2", "UTF-16BE"},
+      {"koi8u", "KOI8-R"},
+      {"binary", "ASCII-8BIT"},
+      {"eucjpms", "eucJP-ms"},
+      {""},
+      {"ujis", "eucJP-ms"},
+      {"cp852", "CP852"},
+      {"cp1251", "Windows-1251"},
+      {"geostd8", NULL},
+      {""},
+      {"sjis", "Shift_JIS"},
+      {"macce", "macCentEuro"},
+      {"latin2", "ISO-8859-2"},
+      {""},
+      {"macroman", "macRoman"},
+      {"dec8", NULL},
+      {"utf32", "UTF-32"},
+      {"latin1", "ISO-8859-1"},
+      {"utf8mb4", "UTF-8"},
+      {"hp8", NULL},
+      {"swe7", NULL},
+      {"euckr", "EUC-KR"},
+      {"cp1257", "Windows-1257"},
+      {""}, {""},
+      {"utf8", "UTF-8"},
+      {"koi8r", "KOI8-R"},
+      {"cp1256", "Windows-1256"},
+      {""}, {""}, {""},
+      {"cp866", "IBM866"},
+      {"latin7", "ISO-8859-13"},
+      {""}, {""}, {""},
+      {"ascii", "US-ASCII"},
+      {"hebrew", "ISO-8859-8"},
+      {""}, {""},
+      {"big5", "Big5"},
+      {"utf16", "UTF-16"},
+      {"cp1250", "Windows-1250"},
+      {""}, {""}, {""},
+      {"cp850", "CP850"},
+      {"tis620", "TIS-620"},
+      {""}, {""}, {""},
+      {"cp932", "Windows-31J"},
+      {"latin5", "ISO-8859-9"},
+      {""}, {""}, {""}, {""}, {""}, {""},
+      {"armscii8", NULL}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = mysql2_mysql_enc_name_to_rb_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register const char *s = wordlist[key].name;
+
+          if (*str == *s && !strcmp (str + 1, s + 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}