cmpi-bindings 0.9.0 → 0.9.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f1cefd23941e2b4ebbda38e5661bd8ce55966373
+  data.tar.gz: cde95d6241639d9ad75a69d72b7a5c6975c9d6f1
+SHA512:
+  metadata.gz: 068cf7f60cee5715603d9d5d2c22e935ecbe7851c619465eceb557ce3bda3fa31e6f9a188ae1d2f78993e6898155cd80f1bc5d48ab08fffe61c380c1b9c1673c
+  data.tar.gz: a92c3337d9244c123f8ffff18b502fe6b1fb6ece0893966d89d8542d4ad4fd862abe3dab42ccd556765b0ec5553254db351ee5c642de6b560acbc700f9af8039

data/ext/cmpi-bindings/cmpi_wrap.c

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
+ * Version 2.0.10
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -398,7 +398,7 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
   return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -462,18 +462,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -481,24 +481,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -1166,19 +1155,19 @@ extern "C" {
 #  error sizeof(void*) is not the same as long or long long
 #endif
 
-
-/* Global Ruby hash table to store Trackings from C/C++
+/* Global hash table to store Trackings from C/C++
    structs to Ruby Objects. 
 */
-static VALUE swig_ruby_trackings = Qnil;
+static st_table* swig_ruby_trackings = NULL;
+
+VALUE get_swig_trackings_count(ANYARGS) {
+  return SWIG2NUM(swig_ruby_trackings->num_entries);
+}
 
-/* Global variable that stores a reference to the ruby
-   hash table delete function. */
-static ID swig_ruby_hash_delete;
 
-/* Setup a Ruby hash table to store Trackings */
+/* Setup a hash table to store Trackings */
 SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
-  /* Create a ruby hash table to store Trackings from C++ 
+  /* Create a hash table to store Trackings from C++ 
      objects to Ruby objects. */
 
   /* Try to see if some other .so has already created a 
@@ -1187,87 +1176,47 @@ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
      This is done to allow multiple DSOs to share the same
      tracking table.
   */
-  ID trackings_id = rb_intern( "@__trackings__" );
+  VALUE trackings_value = Qnil;
+  /* change the variable name so that we can mix modules
+     compiled with older SWIG's */
+  ID trackings_id = rb_intern( "@__safetrackings__" );
   VALUE verbose = rb_gv_get("VERBOSE");
   rb_gv_set("VERBOSE", Qfalse);
-  swig_ruby_trackings = rb_ivar_get( _mSWIG, trackings_id );
+  trackings_value = rb_ivar_get( _mSWIG, trackings_id );
   rb_gv_set("VERBOSE", verbose);
 
-  /* No, it hasn't.  Create one ourselves */ 
-  if ( swig_ruby_trackings == Qnil )
-    {
-      swig_ruby_trackings = rb_hash_new();
-      rb_ivar_set( _mSWIG, trackings_id, swig_ruby_trackings );
-    }
-
-  /* Now store a reference to the hash table delete function
-     so that we only have to look it up once.*/
-  swig_ruby_hash_delete = rb_intern("delete");
-}
-
-/* Get a Ruby number to reference a pointer */
-SWIGRUNTIME VALUE SWIG_RubyPtrToReference(void* ptr) {
-  /* We cast the pointer to an unsigned long
-     and then store a reference to it using
-     a Ruby number object. */
-
-  /* Convert the pointer to a Ruby number */
-  return SWIG2NUM(ptr);
-}
-
-/* Get a Ruby number to reference an object */
-SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) {
-  /* We cast the object to an unsigned long
-     and then store a reference to it using
-     a Ruby number object. */
-
-  /* Convert the Object to a Ruby number */
-  return SWIG2NUM(object);
-}
-
-/* Get a Ruby object from a previously stored reference */
-SWIGRUNTIME VALUE SWIG_RubyReferenceToObject(VALUE reference) {
-  /* The provided Ruby number object is a reference
-     to the Ruby object we want.*/
-
-  /* Convert the Ruby number to a Ruby object */
-  return NUM2SWIG(reference);
+  /* The trick here is that we have to store the hash table
+  pointer in a Ruby variable. We do not want Ruby's GC to
+  treat this pointer as a Ruby object, so we convert it to
+  a Ruby numeric value. */
+  if (trackings_value == Qnil) {
+    /* No, it hasn't.  Create one ourselves */ 
+    swig_ruby_trackings = st_init_numtable();
+    rb_ivar_set( _mSWIG, trackings_id, SWIG2NUM(swig_ruby_trackings) );
+  }
+  else {
+    swig_ruby_trackings = (st_table*)NUM2SWIG(trackings_value);
+  }
+  
+  rb_define_virtual_variable("SWIG_TRACKINGS_COUNT", get_swig_trackings_count, NULL);  
 }
 
 /* Add a Tracking from a C/C++ struct to a Ruby object */
 SWIGRUNTIME void SWIG_RubyAddTracking(void* ptr, VALUE object) {
-  /* In a Ruby hash table we store the pointer and
-     the associated Ruby object.  The trick here is
-     that we cannot store the Ruby object directly - if
-     we do then it cannot be garbage collected.  So
-     instead we typecast it as a unsigned long and
-     convert it to a Ruby number object.*/
-
-  /* Get a reference to the pointer as a Ruby number */
-  VALUE key = SWIG_RubyPtrToReference(ptr);
-
-  /* Get a reference to the Ruby object as a Ruby number */
-  VALUE value = SWIG_RubyObjectToReference(object);
-
   /* Store the mapping to the global hash table. */
-  rb_hash_aset(swig_ruby_trackings, key, value);
+  st_insert(swig_ruby_trackings, (st_data_t)ptr, object);
 }
 
 /* Get the Ruby object that owns the specified C/C++ struct */
 SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
-  /* Get a reference to the pointer as a Ruby number */
-  VALUE key = SWIG_RubyPtrToReference(ptr);
-
   /* Now lookup the value stored in the global hash table */
-  VALUE value = rb_hash_aref(swig_ruby_trackings, key);
-	
-  if (value == Qnil) {
-    /* No object exists - return nil. */
-    return Qnil;
+  VALUE value;
+  
+  if (st_lookup(swig_ruby_trackings, (st_data_t)ptr, &value)) {
+    return value;
   }
   else {
-    /* Convert this value to Ruby object */
-    return SWIG_RubyReferenceToObject(value);
+    return Qnil;
   }
 }
 
@@ -1276,12 +1225,8 @@ SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
    since the same memory address may be reused later to create
    a new object. */
 SWIGRUNTIME void SWIG_RubyRemoveTracking(void* ptr) {
-  /* Get a reference to the pointer as a Ruby number */
-  VALUE key = SWIG_RubyPtrToReference(ptr);
-
-  /* Delete the object from the hash table by calling Ruby's
-     do this we need to call the Hash.delete method.*/
-  rb_funcall(swig_ruby_trackings, swig_ruby_hash_delete, 1, key);
+  /* Delete the object from the hash table */
+  st_delete(swig_ruby_trackings, (st_data_t *)&ptr, NULL);
 }
 
 /* This is a helper method that unlinks a Ruby object from its
@@ -1291,10 +1236,25 @@ SWIGRUNTIME void SWIG_RubyUnlinkObjects(void* ptr) {
   VALUE object = SWIG_RubyInstanceFor(ptr);
 
   if (object != Qnil) {
+    if (TYPE(object) != T_DATA)
+      abort();
     DATA_PTR(object) = 0;
   }
 }
 
+/* This is a helper method that iterates over all the trackings
+   passing the C++ object pointer and its related Ruby object
+   to the passed callback function. */
+
+/* Proxy method to abstract the internal trackings datatype */
+static int _ruby_internal_iterate_callback(void* ptr, VALUE obj, void(*meth)(void* ptr, VALUE obj)) {
+  (*meth)(ptr, obj);
+  return ST_CONTINUE;
+}
+
+SWIGRUNTIME void SWIG_RubyIterateTrackings( void(*meth)(void* ptr, VALUE obj) ) {
+  st_foreach(swig_ruby_trackings, (int (*)(ANYARGS))&_ruby_internal_iterate_callback, (st_data_t)meth);
+}
 
 #ifdef __cplusplus
 }
@@ -1750,7 +1710,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1763,7 +1723,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1846,19 +1806,18 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_float swig_types[51]
 #define SWIGTYPE_p_int swig_types[52]
 #define SWIGTYPE_p_long_long swig_types[53]
-#define SWIGTYPE_p_p__CMPIArray swig_types[54]
-#define SWIGTYPE_p_p_char swig_types[55]
-#define SWIGTYPE_p_p_void swig_types[56]
-#define SWIGTYPE_p_short swig_types[57]
-#define SWIGTYPE_p_signed_char swig_types[58]
-#define SWIGTYPE_p_uint64_t swig_types[59]
-#define SWIGTYPE_p_unsigned_char swig_types[60]
-#define SWIGTYPE_p_unsigned_int swig_types[61]
-#define SWIGTYPE_p_unsigned_long_long swig_types[62]
-#define SWIGTYPE_p_unsigned_short swig_types[63]
-#define SWIGTYPE_p_void swig_types[64]
-static swig_type_info *swig_types[66];
-static swig_module_info swig_module = {swig_types, 65, 0, 0, 0, 0};
+#define SWIGTYPE_p_p_char swig_types[54]
+#define SWIGTYPE_p_p_void swig_types[55]
+#define SWIGTYPE_p_short swig_types[56]
+#define SWIGTYPE_p_signed_char swig_types[57]
+#define SWIGTYPE_p_uint64_t swig_types[58]
+#define SWIGTYPE_p_unsigned_char swig_types[59]
+#define SWIGTYPE_p_unsigned_int swig_types[60]
+#define SWIGTYPE_p_unsigned_long_long swig_types[61]
+#define SWIGTYPE_p_unsigned_short swig_types[62]
+#define SWIGTYPE_p_void swig_types[63]
+static swig_type_info *swig_types[65];
+static swig_module_info swig_module = {swig_types, 64, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1873,7 +1832,7 @@ static VALUE mCmpi;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020010 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2307,10 +2266,12 @@ cmpi_broker()
   VALUE broker = rb_funcall(mCmpi, rb_intern("broker"), 0);
   res1 = SWIG_ConvertPtr(broker, &ptr, SWIGTYPE_p__CMPIBroker, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError("", "CMPIBroker *", "broker", 1, broker));
+    SWIG_exception(SWIG_ArgError(res1), Ruby_Format_TypeError("", "CMPIBroker *", "broker", 1, broker));
   }
   return (CMPIBroker *)ptr;
+#if !defined (SWIGRUBY)
 fail:
+#endif
   return NULL;
 }
 
@@ -2339,11 +2300,6 @@ to_cmpi_string(VALUE data)
 static CMPIType
 target_to_value(Target_Type data, CMPIValue *value, CMPIType type)
 {
-  /* A NULL value always has CMPIType CMPI_null */
-  if (Target_Null_p(data)) {
-    value->chars = NULL;
-    return CMPI_null;
-  }
 #if defined(SWIGRUBY)
   /*
    * Array-type
@@ -2353,7 +2309,12 @@ target_to_value(Target_Type data, CMPIValue *value, CMPIType type)
 
     const CMPIBroker* broker = cmpi_broker();
     int size, i;
+    CMPIType element_type = 0;    
     if (TYPE(data) != T_ARRAY) {
+      if (Target_Null_p(data)) {
+        value->array = NULL;
+        return CMPI_null;
+      }
       data = rb_funcall(data, rb_intern("to_a"), 0 );
     }
     size = RARRAY_LEN(data);
@@ -2362,9 +2323,22 @@ target_to_value(Target_Type data, CMPIValue *value, CMPIType type)
     type &= ~CMPI_ARRAY;
     for (i = 0; i < size; ++i) {
       CMPIValue val;
+      CMPIType new_type;
       Target_Type elem = rb_ary_entry(data, i);
-      target_to_value(elem, &val, type);
-      CMSetArrayElementAt(value->array, i, &val, type);
+      new_type = target_to_value(elem, &val, type);
+      if (element_type) {
+        /* ensure all array elements have same type */
+        if (new_type != element_type) {
+          SWIG_exception(SWIG_ValueError, "non-uniform element types in array");
+        }
+      }
+      else {
+        element_type = new_type;
+      }      
+      CMSetArrayElementAt(value->array, i, &val, element_type);
+    }
+    if (type & ((1<<15)|(1<<14))) { /* embedded instance or object */
+      type = element_type;
     }
     /* re-add ARRAY flag */
     type |= CMPI_ARRAY;
@@ -2377,16 +2351,26 @@ target_to_value(Target_Type data, CMPIValue *value, CMPIType type)
      */
 
     if ((type & CMPI_REAL)) {
+      if (Target_Null_p(data)) {
+        SWIG_exception(SWIG_ValueError, "can't convert NULL to real");
+      }
       if (TYPE(data) != T_FLOAT) {
         data = rb_funcall(data, rb_intern("to_f"), 0 );
       }
     }
     else if ((type & CMPI_INTEGER)) {
+      if (Target_Null_p(data)) {
+        SWIG_exception(SWIG_ValueError, "can't convert NULL to integer");
+      }
       if (!FIXNUM_P(data)) {
         data = rb_funcall(data, rb_intern("to_i"), 0 );
       }
     }
-    
+    else if (Target_Null_p(data)) {
+      /* A NULL value always has CMPIType CMPI_null */
+      value->chars = NULL;
+      return CMPI_null;
+    }
     switch (type) {
       case CMPI_null: /*         0 */
 	/* CMPIType not given, deduce it from Ruby type */
@@ -2491,7 +2475,7 @@ target_to_value(Target_Type data, CMPIValue *value, CMPIType type)
           res = SWIG_ConvertPtr(data, (void *)&(value->inst), SWIGTYPE_p__CMPIInstance, 0 |  0 );
 	}
 	if (!SWIG_IsOK(res)) {
-	  SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "CMPIInstance *","target_to_value", 1, data )); 
+	  SWIG_exception(SWIG_ArgError(res), Ruby_Format_TypeError( "", "CMPIInstance *","target_to_value", 1, data )); 
         }
         break;
       }
@@ -2512,7 +2496,7 @@ target_to_value(Target_Type data, CMPIValue *value, CMPIType type)
           res = SWIG_ConvertPtr(data, (void *)&(value->ref), SWIGTYPE_p__CMPIObjectPath, 0 |  0 );
 	}
 	if (!SWIG_IsOK(res)) {
-	  SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "CMPIObjectPath *","target_to_value", 1, data )); 
+	  SWIG_exception(SWIG_ArgError(res), Ruby_Format_TypeError( "", "CMPIObjectPath *","target_to_value", 1, data )); 
 	}
         break;
       }
@@ -2553,6 +2537,31 @@ target_to_value(Target_Type data, CMPIValue *value, CMPIType type)
       case CMPI_charsptr: /*     ((16+10)<<8) */
         break;
 #endif
+      case ((1)<<14): { /* cmpi-bindings-ruby: EmbeddedObject */
+        /* class or instance */
+        /* need CMPIClass as Ruby class */
+        int res;
+        res = SWIG_ConvertPtr(data, (void *)&(value->inst), SWIGTYPE_p__CMPIInstance, 0 |  0 );
+	if (!SWIG_IsOK(res)) {
+          SWIG_exception(SWIG_ValueError, "EmbeddedObject supports CMPI::Instance only");
+        }
+        else {
+          type = CMPI_instance;
+        }
+      }
+      break;
+      case ((1)<<15): { /* cmpi-bindings-ruby: EmbeddedInstance */
+        /* class or instance */
+        int res;
+        res = SWIG_ConvertPtr(data, (void *)&(value->inst), SWIGTYPE_p__CMPIInstance, 0 |  0 );
+	if (!SWIG_IsOK(res)) {
+          SWIG_exception(SWIG_ValueError, "EmbeddedInstance expects CMPI::Instance");
+        }
+        else {
+          type = CMPI_instance;
+        }
+      }
+      break;
       default: {
         static char msg[64];
         snprintf(msg, 63, "target_to_value unhandled type 0x%04x", type);
@@ -2561,7 +2570,9 @@ target_to_value(Target_Type data, CMPIValue *value, CMPIType type)
       break;
     } /* switch (type) */
   }
+#if !defined (SWIGRUBY)
 fail:
+#endif
   return type;
 #else
 #error Undefined
@@ -2647,6 +2658,32 @@ static void _raise_ex(const CMPIStatus* st)
 #endif /* SWIGPYTHON */
 }
 
+/*
+ *==============================================================================
+ * CMPISelectExp wrapper to capture also the projections
+ *==============================================================================
+ */
+
+typedef struct select_filter_exp {
+  const CMPISelectExp *exp;
+  char **filter;
+} select_filter_exp;
+
+static select_filter_exp *
+wrap_select_filter(const CMPISelectExp *exp, char **keys)
+{
+  select_filter_exp *sfe = (select_filter_exp *)calloc(1, sizeof(select_filter_exp));
+  if (sfe == NULL) {
+    SWIG_exception(SWIG_MemoryError, "malloc failed");
+  }
+  sfe->exp = exp;
+  sfe->filter = keys;
+#if !defined(SWIGRUBY)
+fail:
+#endif
+  return sfe;
+}
+
 /*
 **==============================================================================
 **
@@ -2723,6 +2760,71 @@ static void log_message(
 
 #include "string_array.h"
 
+/*
+ * helper for CMPISelectExp wrapper
+ */
+
+static void
+release_select_filter_exp(select_filter_exp *sfe)
+{
+  CMRelease((CMPISelectExp *)sfe->exp);
+  if (sfe->filter) {
+    int i = 0;
+    while (sfe->filter[i])
+      free(sfe->filter[i++]);
+    free(sfe->filter);
+  }
+  free(sfe);
+}
+
+static select_filter_exp *
+create_select_filter_exp(const CMPIBroker* broker, const char *query, const char *language, char **keys)
+{
+  CMPIStatus st = {CMPI_RC_OK, NULL};
+  CMPIArray *projection;
+  select_filter_exp *sfe;
+  CMPISelectExp *exp = CMNewSelectExp(broker, query, language, &projection, &st);
+  RAISE_IF(st);
+  sfe = wrap_select_filter(exp, NULL);
+  if (projection || keys) {
+    size_t kcount = 0;
+    int pcount = 0;
+    int count = 0;
+    if (keys) {
+      kcount = string_array_size(keys);
+    }
+    if (projection) {
+      pcount = CMGetArrayCount(projection, NULL);
+    }
+    count = pcount + kcount;
+    if (count > 0) {
+      int i = 0;
+      sfe->filter = calloc(count + 1, sizeof(char **)); /* incl. final NULL ptr */
+      for (; i < kcount; i++) {
+        sfe->filter[i] = strdup(keys[i]);
+      }
+      for (; i < count; i++) {
+        CMPIData data = CMGetArrayElementAt(projection, i-kcount, &st);
+        if (st.rc != CMPI_RC_OK) {
+          release_select_filter_exp(sfe);
+          sfe = NULL;            
+          RAISE_IF(st);
+          break;
+        }
+        sfe->filter[i] = (char *)strdup(CMGetCharsPtr(data.value.string, NULL));
+        CMRelease(data.value.string);
+      }
+    }
+    if (projection) {
+      CMRelease(projection);
+    }
+  }
+#if !defined(SWIGRUBY)
+fail:
+#endif
+  return sfe;
+}
+
 
 
 #include <limits.h>
@@ -2752,7 +2854,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/2.0.10/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2811,7 +2913,7 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 }
 
 
-/*@SWIG:/usr/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/2.0.10/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2900,7 +3002,7 @@ SWIG_From_unsigned_SS_char  (unsigned char value)
 }
 
 
-/*@SWIG:/usr/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/2.0.10/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2929,7 +3031,7 @@ SWIG_AsVal_long_SS_long (VALUE obj, long long *val)
 }
 
 
-/*@SWIG:/usr/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/2.0.10/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -3020,7 +3122,7 @@ SWIG_From_signed_SS_char  (signed char value)
 }
 
 
-/*@SWIG:/usr/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/2.0.10/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -3174,7 +3276,7 @@ SWIGINTERN int _CMPIData_is_array(struct _CMPIData *self){
 SWIGINTERN VALUE _CMPIData__value(struct _CMPIData *self){
     return data_value(self);
   }
-SWIGINTERN struct _CMPIStatus *new__CMPIStatus(){
+SWIGINTERN struct _CMPIStatus *new__CMPIStatus(void){
     CMPIStatus *status = (CMPIStatus *)calloc(1, sizeof(CMPIStatus));
     status->rc = CMPI_RC_OK;
     return status;
@@ -3316,12 +3418,12 @@ SWIGINTERN struct _CMPIObjectPath *new__CMPIObjectPath(VALUE ns_t,VALUE cn_t){
       /* parse <namespace>:<classname>[.<key>=<value>[,<key>=<value>]...] */
       CMPIValue value;
       const char *ptr;
-      
       /* find and extract namespace */
+/*      fprintf(stderr, "CMPIObjectPath.new(%s)\n", ns); */
       ptr = strchr(ns, ':');
       if (ptr == NULL) {
  	path = NULL;
-	SWIG_exception_fail(SWIG_ValueError, "Missing ':' between namespace and classname");
+	SWIG_exception(SWIG_ValueError, "Missing ':' between namespace and classname");
       }
       ns = strndup(ns, ptr-ns);
       /* find and extract classname */
@@ -3334,7 +3436,6 @@ SWIGINTERN struct _CMPIObjectPath *new__CMPIObjectPath(VALUE ns_t,VALUE cn_t){
       path = CMNewObjectPath( broker, ns, cn, &st );
       RAISE_IF(st);
       
-      
       /* find and extract properties (if any) */
 
       /*
@@ -3349,25 +3450,30 @@ SWIGINTERN struct _CMPIObjectPath *new__CMPIObjectPath(VALUE ns_t,VALUE cn_t){
 	ptr = strchr(key, '=');
 	if (ptr == NULL) {
  	  path = NULL;
-	  SWIG_exception_fail(SWIG_ValueError, "Missing '=' between property name and value");
+	  SWIG_exception(SWIG_ValueError, "Missing '=' between property name and value");
         }
 	key = strndup(key, ptr-key);
 	val = ++ptr;
 	if (*val == '"') {
 	  val++;
 	  ptr = val;
-	  for (;;) {
+	  for (;*ptr;) {
 	    ptr = strchr(ptr, '"');
 	    if (ptr == NULL) {
 	      path = NULL;
-	      SWIG_exception_fail(SWIG_ValueError, "Missing '\"' at end of string value");
+	      SWIG_exception(SWIG_ValueError, "Missing '\"' at end of string value");
 	    }
 	    if (*(ptr-1) != '\\') /* not escaped " */
 	      break;
 	    ptr++;
 	  }
 	  val = strndup(val, ptr-val);
-	  ++ptr;
+	  ++ptr; /* skip " */
+          if (*ptr) { /* not EOS */
+            if (*ptr++ != ',') {
+              SWIG_exception(SWIG_ValueError, "Missing ',' after string value");
+            }
+          }
 	}
 	else {
 	  ptr = strchr(ptr, ',');
@@ -3375,8 +3481,9 @@ SWIGINTERN struct _CMPIObjectPath *new__CMPIObjectPath(VALUE ns_t,VALUE cn_t){
 	    val = strndup(val, ptr-val);
 	    ++ptr;
 	  }
-	  else
+	  else {
 	    val = strdup(val);
+          }
 	}
 	value.string = CMNewString(broker, val, &st);
 	RAISE_IF(st);
@@ -3390,7 +3497,9 @@ SWIGINTERN struct _CMPIObjectPath *new__CMPIObjectPath(VALUE ns_t,VALUE cn_t){
       path = CMNewObjectPath( broker, ns, cn, &st );
       RAISE_IF(st);
     }
-fail:
+
+
+
     return path;
   }
 SWIGINTERN char const *_CMPIObjectPath_string(struct _CMPIObjectPath *self){
@@ -3403,10 +3512,22 @@ SWIGINTERN CMPIStatus _CMPIObjectPath_set(struct _CMPIObjectPath *self,VALUE pro
     const char *name;
     CMPIValue value;
     CMPIType actual_type;
-    CMPIType type = FIXNUM_P(expected_type) ? FIX2LONG(expected_type) : 0;
+    CMPIType type;
+    CMPIStatus status;
+    if (NIL_P(expected_type)) {
+      type = 0;
+    }
+    else if (FIXNUM_P(expected_type)) {
+      type = FIX2LONG(expected_type);
+    }
+    else {
+      SWIG_exception(SWIG_ValueError, "bad expected_type");
+    }
     name = target_charptr(property);
     actual_type = target_to_value(data, &value, type);
-    return CMAddKey(self, name, &value, actual_type);
+    status = CMAddKey(self, name, &value, actual_type);
+    RAISE_IF(status);
+    return status;
   }
 SWIGINTERN void _CMPIObjectPath_add_key(struct _CMPIObjectPath *self,char const *name,CMPIValue const *value,CMPIType const type){
     RAISE_IF(CMAddKey(self, name, value, type));
@@ -3571,10 +3692,22 @@ SWIGINTERN CMPIStatus _CMPIInstance_set(struct _CMPIInstance *self,VALUE propert
     const char *name;
     CMPIValue value;
     CMPIType actual_type;
-    CMPIType type = FIXNUM_P(expected_type) ? FIX2LONG(expected_type) : 0;
+    CMPIType type;
+    CMPIStatus status;
+    if (NIL_P(expected_type)) {
+      type = 0;
+    }
+    else if (FIXNUM_P(expected_type)) {
+      type = FIX2LONG(expected_type);
+    }
+    else {
+      SWIG_exception(SWIG_ValueError, "bad expected_type");
+    }
     name = target_charptr(property);
     actual_type = target_to_value(data, &value, type);
-    return CMSetProperty(self, name, &value, actual_type);
+    status = CMSetProperty(self, name, &value, actual_type);
+    RAISE_IF(status);
+    return status;
   }
 SWIGINTERN void _CMPIInstance_set_property(struct _CMPIInstance *self,char const *name,CMPIValue const *value,CMPIType const type){
     RAISE_IF(CMSetProperty(self, name, value, type));
@@ -3772,8 +3905,26 @@ SWIGINTERN int _CMPIArgs_arg_count(struct _CMPIArgs *self){
 
     return result;
   }
+SWIGINTERN struct _CMPISelectExp *new__CMPISelectExp(char const *query,char const *language,char **keys){
+
+    const CMPIBroker* broker = cmpi_broker();
+
+    return (CMPISelectExp *)create_select_filter_exp(broker, query, language, keys);
+  }
+SWIGINTERN int _CMPISelectExp_match(struct _CMPISelectExp *self,CMPIInstance *instance){
+    CMPIStatus st = {CMPI_RC_OK, NULL};
+    select_filter_exp *sfe = (select_filter_exp *)self;
+    CMPIBoolean res = CMEvaluateSelExp(sfe->exp, instance, &st);
+    RAISE_IF(st);
+    return res;
+  }
+SWIGINTERN char **_CMPISelectExp_filter(struct _CMPISelectExp *self){
+    select_filter_exp *sfe = (select_filter_exp *)self;
+    return sfe->filter;
+  }
 SWIGINTERN char const *_CMPISelectExp_string(struct _CMPISelectExp *self){
-    CMPIString *s = CMGetSelExpString(self, NULL);
+    select_filter_exp *sfe = (select_filter_exp *)self;
+    CMPIString *s = CMGetSelExpString(sfe->exp, NULL);
     const char *result = strdup(CMGetCharPtr(s));
     CMRelease(s);
     return result;
@@ -3927,7 +4078,7 @@ SWIGINTERN uint64_t _CMPIDateTime_to_i(struct _CMPIDateTime *self){
 SWIGINTERN int _CMPIDateTime_is_interval(struct _CMPIDateTime *self){
     return CMIsInterval(self, NULL);
   }
-SWIGINTERN struct _CMPIException *new__CMPIException(){
+SWIGINTERN struct _CMPIException *new__CMPIException(void){
       return (CMPIException*)calloc(1, sizeof(CMPIException));
   }
 SWIGINTERN int _CMPIException_get_error_code(struct _CMPIException *self){
@@ -4176,14 +4327,8 @@ SWIGINTERN CMPIArray *_CMPIBroker_new_array(struct _CMPIBroker *self,int count,C
     RAISE_IF(st);
     return result;
   }
-SWIGINTERN CMPISelectExp *_CMPIBroker_new_select_exp(struct _CMPIBroker *self,char const *query,char const *lang,CMPIArray **projection){
-    CMPIStatus st = { CMPI_RC_OK, NULL };
-    CMPISelectExp* result;
-
-    return CMNewSelectExp(self, query, lang, projection, &st);
-    RAISE_IF(st);
-
-    return result;
+SWIGINTERN CMPISelectExp *_CMPIBroker_new_select_exp(struct _CMPIBroker *self,char const *query,char const *lang,char **projection){
+    return (CMPISelectExp *)create_select_filter_exp(self, query, lang, projection);
   }
 SWIGINTERN CMPIError *_CMPIBroker_new_error(struct _CMPIBroker *self,char const *owner,char const *msgID,char const *msg,CMPIErrorSeverity const sev,CMPIErrorProbableCause const pc,CMPIrc const cimStatusCode){
     CMPIStatus st = { CMPI_RC_OK, NULL };
@@ -10203,8 +10348,6 @@ _wrap_CMPIInstance_set_property_filter(int argc, VALUE *argv, VALUE self) {
   char **arg2 = (char **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
@@ -10214,11 +10357,27 @@ _wrap_CMPIInstance_set_property_filter(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct _CMPIInstance *","set_property_filter", 1, self )); 
   }
   arg1 = (struct _CMPIInstance *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_p_char, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const **","set_property_filter", 2, argv[0] )); 
+  {
+    if (argv[0] == Qnil) {
+      arg2 = NULL;
+    }
+    else {
+      int count, i;
+      rb_check_type(argv[0], T_ARRAY);
+      count = RARRAY_LEN(argv[0]);
+      arg2 = (char **)calloc(count + 1, sizeof(char **)); /* incl. trailing NULL */
+      if (arg2 == NULL) {
+        SWIG_exception(SWIG_MemoryError, "malloc failed");
+      }
+      for (i = 0; i < count; i++) {
+        arg2[i] = (char *)target_charptr(rb_ary_entry(argv[0], i));
+        if (arg2[i] == NULL) {
+          SWIG_exception(SWIG_MemoryError, "malloc failed");
+        }
+      }
+      arg2[i] = NULL;
+    }
   }
-  arg2 = (char **)(argp2);
   {
     _clr_raised();
     _CMPIInstance_set_property_filter(arg1,(char const **)arg2);
@@ -10233,8 +10392,16 @@ _wrap_CMPIInstance_set_property_filter(int argc, VALUE *argv, VALUE self) {
       SWIG_fail;
     }
   }
+  {
+    if (arg2)
+    free(arg2);
+  }
   return Qnil;
 fail:
+  {
+    if (arg2)
+    free(arg2);
+  }
   return Qnil;
 }
 
@@ -10580,8 +10747,117 @@ fail:
 */
 static swig_class SwigClassCMPISelectExp;
 
+#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+SWIGINTERN VALUE
+_wrap_CMPISelectExp_allocate(VALUE self) {
+#else
+  SWIGINTERN VALUE
+  _wrap_CMPISelectExp_allocate(int argc, VALUE *argv, VALUE self) {
+#endif
+    
+    
+    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p__CMPISelectExp);
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+    rb_obj_call_init(vresult, argc, argv);
+#endif
+    return vresult;
+  }
+  
+
+
+/*
+  Document-method: Cmpi::CMPISelectExp.new
+
+  call-seq:
+    CMPISelectExp.new(char const * query, char const * language, char ** keys=nil)
+
+Class constructor.
+
+*/
+SWIGINTERN VALUE
+_wrap_new_CMPISelectExp(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char **arg3 = (char **) NULL ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  struct _CMPISelectExp *result = 0 ;
+  
+  if ((argc < 2) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","_CMPISelectExp", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","_CMPISelectExp", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  if (argc > 2) {
+    {
+      if (argv[2] == Qnil) {
+        arg3 = NULL;
+      }
+      else {
+        int count, i;
+        rb_check_type(argv[2], T_ARRAY);
+        count = RARRAY_LEN(argv[2]);
+        arg3 = (char **)calloc(count + 1, sizeof(char **)); /* incl. trailing NULL */
+        if (arg3 == NULL) {
+          SWIG_exception(SWIG_MemoryError, "malloc failed");
+        }
+        for (i = 0; i < count; i++) {
+          arg3[i] = (char *)target_charptr(rb_ary_entry(argv[2], i));
+          if (arg3[i] == NULL) {
+            SWIG_exception(SWIG_MemoryError, "malloc failed");
+          }
+        }
+        arg3[i] = NULL;
+      }
+    }
+  }
+  {
+    _clr_raised();
+    result = (struct _CMPISelectExp *)new__CMPISelectExp((char const *)arg1,(char const *)arg2,arg3);
+    DATA_PTR(self) = result;
+    if (_get_raised())
+    {
+      _clr_raised();
+      
+      
+      
+      
+      
+      SWIG_fail;
+    }
+  }
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    if (arg3)
+    free(arg3);
+  }
+  return self;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    if (arg3)
+    free(arg3);
+  }
+  return Qnil;
+}
+
+
 SWIGINTERN void delete__CMPISelectExp(struct _CMPISelectExp *self){
-    CMRelease( self );
+    release_select_filter_exp((select_filter_exp *)self);
   }
 SWIGINTERN void
 free__CMPISelectExp(struct _CMPISelectExp *arg1) {
@@ -10589,6 +10865,125 @@ free__CMPISelectExp(struct _CMPISelectExp *arg1) {
 }
 
 
+/*
+  Document-method: Cmpi::CMPISelectExp.match
+
+  call-seq:
+    match(CMPIInstance instance) -> int
+
+An instance method.
+
+*/
+SWIGINTERN VALUE
+_wrap_CMPISelectExp_match(int argc, VALUE *argv, VALUE self) {
+  struct _CMPISelectExp *arg1 = (struct _CMPISelectExp *) 0 ;
+  CMPIInstance *arg2 = (CMPIInstance *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p__CMPISelectExp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct _CMPISelectExp *","match", 1, self )); 
+  }
+  arg1 = (struct _CMPISelectExp *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p__CMPIInstance, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "CMPIInstance *","match", 2, argv[0] )); 
+  }
+  arg2 = (CMPIInstance *)(argp2);
+  {
+    _clr_raised();
+    result = (int)_CMPISelectExp_match(arg1,arg2);
+    if (_get_raised())
+    {
+      _clr_raised();
+      
+      
+      
+      
+      
+      SWIG_fail;
+    }
+  }
+  vresult = (result != 0) ? Qtrue : Qfalse;
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: Cmpi::CMPISelectExp.filter
+
+  call-seq:
+    filter -> char **
+
+An instance method.
+
+*/
+SWIGINTERN VALUE
+_wrap_CMPISelectExp_filter(int argc, VALUE *argv, VALUE self) {
+  struct _CMPISelectExp *arg1 = (struct _CMPISelectExp *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  char **result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p__CMPISelectExp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct _CMPISelectExp *","filter", 1, self )); 
+  }
+  arg1 = (struct _CMPISelectExp *)(argp1);
+  {
+    _clr_raised();
+    result = (char **)_CMPISelectExp_filter(arg1);
+    if (_get_raised())
+    {
+      _clr_raised();
+      
+      
+      
+      
+      
+      SWIG_fail;
+    }
+  }
+  {
+    if (result == NULL) {
+      vresult = Qnil;
+    }
+    else {
+      size_t count = string_array_size(result);
+      if (count == 0) {
+        vresult = rb_ary_new();
+      }
+      else {
+        int i;
+        vresult = rb_ary_new2(count);
+        for (i = 0; i < count; i++) {
+          rb_ary_store(vresult, i, rb_str_new2(result[i]));
+        }
+      }
+    }
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
 /*
   Document-method: Cmpi::CMPISelectExp.to_s
 
@@ -12486,8 +12881,6 @@ _wrap_CMPIBroker_enumInstances(int argc, VALUE *argv, VALUE self) {
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   CMPIEnumeration *result = 0 ;
   VALUE vresult = Qnil;
   
@@ -12509,11 +12902,27 @@ _wrap_CMPIBroker_enumInstances(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "CMPIObjectPath const *","enumInstances", 3, argv[1] )); 
   }
   arg3 = (CMPIObjectPath *)(argp3);
-  res4 = SWIG_ConvertPtr(argv[2], &argp4,SWIGTYPE_p_p_char, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const **","enumInstances", 4, argv[2] )); 
+  {
+    if (argv[2] == Qnil) {
+      arg4 = NULL;
+    }
+    else {
+      int count, i;
+      rb_check_type(argv[2], T_ARRAY);
+      count = RARRAY_LEN(argv[2]);
+      arg4 = (char **)calloc(count + 1, sizeof(char **)); /* incl. trailing NULL */
+      if (arg4 == NULL) {
+        SWIG_exception(SWIG_MemoryError, "malloc failed");
+      }
+      for (i = 0; i < count; i++) {
+        arg4[i] = (char *)target_charptr(rb_ary_entry(argv[2], i));
+        if (arg4[i] == NULL) {
+          SWIG_exception(SWIG_MemoryError, "malloc failed");
+        }
+      }
+      arg4[i] = NULL;
+    }
   }
-  arg4 = (char **)(argp4);
   {
     _clr_raised();
     result = (CMPIEnumeration *)_CMPIBroker_enumInstances(arg1,(struct _CMPIContext const *)arg2,(struct _CMPIObjectPath const *)arg3,(char const **)arg4);
@@ -12529,8 +12938,16 @@ _wrap_CMPIBroker_enumInstances(int argc, VALUE *argv, VALUE self) {
     }
   }
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p__CMPIEnumeration, 0 |  0 );
+  {
+    if (arg4)
+    free(arg4);
+  }
   return vresult;
 fail:
+  {
+    if (arg4)
+    free(arg4);
+  }
   return Qnil;
 }
 
@@ -12557,8 +12974,6 @@ _wrap_CMPIBroker_getInstance(int argc, VALUE *argv, VALUE self) {
   int res2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   CMPIInstance *result = 0 ;
   VALUE vresult = Qnil;
   
@@ -12580,11 +12995,27 @@ _wrap_CMPIBroker_getInstance(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "CMPIObjectPath const *","getInstance", 3, argv[1] )); 
   }
   arg3 = (CMPIObjectPath *)(argp3);
-  res4 = SWIG_ConvertPtr(argv[2], &argp4,SWIGTYPE_p_p_char, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const **","getInstance", 4, argv[2] )); 
+  {
+    if (argv[2] == Qnil) {
+      arg4 = NULL;
+    }
+    else {
+      int count, i;
+      rb_check_type(argv[2], T_ARRAY);
+      count = RARRAY_LEN(argv[2]);
+      arg4 = (char **)calloc(count + 1, sizeof(char **)); /* incl. trailing NULL */
+      if (arg4 == NULL) {
+        SWIG_exception(SWIG_MemoryError, "malloc failed");
+      }
+      for (i = 0; i < count; i++) {
+        arg4[i] = (char *)target_charptr(rb_ary_entry(argv[2], i));
+        if (arg4[i] == NULL) {
+          SWIG_exception(SWIG_MemoryError, "malloc failed");
+        }
+      }
+      arg4[i] = NULL;
+    }
   }
-  arg4 = (char **)(argp4);
   {
     _clr_raised();
     result = (CMPIInstance *)_CMPIBroker_getInstance(arg1,(struct _CMPIContext const *)arg2,(struct _CMPIObjectPath const *)arg3,(char const **)arg4);
@@ -12600,8 +13031,16 @@ _wrap_CMPIBroker_getInstance(int argc, VALUE *argv, VALUE self) {
     }
   }
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p__CMPIInstance, 0 |  0 );
+  {
+    if (arg4)
+    free(arg4);
+  }
   return vresult;
 fail:
+  {
+    if (arg4)
+    free(arg4);
+  }
   return Qnil;
 }
 
@@ -12702,8 +13141,6 @@ _wrap_CMPIBroker_modifyInstance(int argc, VALUE *argv, VALUE self) {
   int res3 = 0 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
   
   if ((argc < 4) || (argc > 4)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
@@ -12728,11 +13165,27 @@ _wrap_CMPIBroker_modifyInstance(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "CMPIInstance const *","modifyInstance", 4, argv[2] )); 
   }
   arg4 = (CMPIInstance *)(argp4);
-  res5 = SWIG_ConvertPtr(argv[3], &argp5,SWIGTYPE_p_p_char, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "char const **","modifyInstance", 5, argv[3] )); 
+  {
+    if (argv[3] == Qnil) {
+      arg5 = NULL;
+    }
+    else {
+      int count, i;
+      rb_check_type(argv[3], T_ARRAY);
+      count = RARRAY_LEN(argv[3]);
+      arg5 = (char **)calloc(count + 1, sizeof(char **)); /* incl. trailing NULL */
+      if (arg5 == NULL) {
+        SWIG_exception(SWIG_MemoryError, "malloc failed");
+      }
+      for (i = 0; i < count; i++) {
+        arg5[i] = (char *)target_charptr(rb_ary_entry(argv[3], i));
+        if (arg5[i] == NULL) {
+          SWIG_exception(SWIG_MemoryError, "malloc failed");
+        }
+      }
+      arg5[i] = NULL;
+    }
   }
-  arg5 = (char **)(argp5);
   {
     _clr_raised();
     _CMPIBroker_modifyInstance(arg1,(struct _CMPIContext const *)arg2,(struct _CMPIObjectPath const *)arg3,(struct _CMPIInstance const *)arg4,(char const **)arg5);
@@ -12747,8 +13200,16 @@ _wrap_CMPIBroker_modifyInstance(int argc, VALUE *argv, VALUE self) {
       SWIG_fail;
     }
   }
+  {
+    if (arg5)
+    free(arg5);
+  }
   return Qnil;
 fail:
+  {
+    if (arg5)
+    free(arg5);
+  }
   return Qnil;
 }
 
@@ -12937,8 +13398,6 @@ _wrap_CMPIBroker_associators(int argc, VALUE *argv, VALUE self) {
   int res7 ;
   char *buf7 = 0 ;
   int alloc7 = 0 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
   CMPIEnumeration *result = 0 ;
   VALUE vresult = Qnil;
   
@@ -12980,11 +13439,27 @@ _wrap_CMPIBroker_associators(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "char const *","associators", 7, argv[5] ));
   }
   arg7 = (char *)(buf7);
-  res8 = SWIG_ConvertPtr(argv[6], &argp8,SWIGTYPE_p_p_char, 0 |  0 );
-  if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), Ruby_Format_TypeError( "", "char const **","associators", 8, argv[6] )); 
+  {
+    if (argv[6] == Qnil) {
+      arg8 = NULL;
+    }
+    else {
+      int count, i;
+      rb_check_type(argv[6], T_ARRAY);
+      count = RARRAY_LEN(argv[6]);
+      arg8 = (char **)calloc(count + 1, sizeof(char **)); /* incl. trailing NULL */
+      if (arg8 == NULL) {
+        SWIG_exception(SWIG_MemoryError, "malloc failed");
+      }
+      for (i = 0; i < count; i++) {
+        arg8[i] = (char *)target_charptr(rb_ary_entry(argv[6], i));
+        if (arg8[i] == NULL) {
+          SWIG_exception(SWIG_MemoryError, "malloc failed");
+        }
+      }
+      arg8[i] = NULL;
+    }
   }
-  arg8 = (char **)(argp8);
   {
     _clr_raised();
     result = (CMPIEnumeration *)_CMPIBroker_associators(arg1,(struct _CMPIContext const *)arg2,(struct _CMPIObjectPath const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const **)arg8);
@@ -13004,12 +13479,20 @@ _wrap_CMPIBroker_associators(int argc, VALUE *argv, VALUE self) {
   if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
   if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
   if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+  {
+    if (arg8)
+    free(arg8);
+  }
   return vresult;
 fail:
   if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
   if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
   if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
   if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+  {
+    if (arg8)
+    free(arg8);
+  }
   return Qnil;
 }
 
@@ -13153,8 +13636,6 @@ _wrap_CMPIBroker_references(int argc, VALUE *argv, VALUE self) {
   int res5 ;
   char *buf5 = 0 ;
   int alloc5 = 0 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
   CMPIEnumeration *result = 0 ;
   VALUE vresult = Qnil;
   
@@ -13186,11 +13667,27 @@ _wrap_CMPIBroker_references(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "char const *","references", 5, argv[3] ));
   }
   arg5 = (char *)(buf5);
-  res6 = SWIG_ConvertPtr(argv[4], &argp6,SWIGTYPE_p_p_char, 0 |  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "char const **","references", 6, argv[4] )); 
+  {
+    if (argv[4] == Qnil) {
+      arg6 = NULL;
+    }
+    else {
+      int count, i;
+      rb_check_type(argv[4], T_ARRAY);
+      count = RARRAY_LEN(argv[4]);
+      arg6 = (char **)calloc(count + 1, sizeof(char **)); /* incl. trailing NULL */
+      if (arg6 == NULL) {
+        SWIG_exception(SWIG_MemoryError, "malloc failed");
+      }
+      for (i = 0; i < count; i++) {
+        arg6[i] = (char *)target_charptr(rb_ary_entry(argv[4], i));
+        if (arg6[i] == NULL) {
+          SWIG_exception(SWIG_MemoryError, "malloc failed");
+        }
+      }
+      arg6[i] = NULL;
+    }
   }
-  arg6 = (char **)(argp6);
   {
     _clr_raised();
     result = (CMPIEnumeration *)_CMPIBroker_references(arg1,(struct _CMPIContext const *)arg2,(struct _CMPIObjectPath const *)arg3,(char const *)arg4,(char const *)arg5,(char const **)arg6);
@@ -13208,10 +13705,18 @@ _wrap_CMPIBroker_references(int argc, VALUE *argv, VALUE self) {
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p__CMPIEnumeration, 0 |  0 );
   if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
   if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  {
+    if (arg6)
+    free(arg6);
+  }
   return vresult;
 fail:
   if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
   if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  {
+    if (arg6)
+    free(arg6);
+  }
   return Qnil;
 }
 
@@ -14033,7 +14538,7 @@ fail:
   Document-method: Cmpi::CMPIBroker.new_select_exp
 
   call-seq:
-    new_select_exp(char const * query, char const * lang, CMPIArray ** projection) -> CMPISelectExp
+    new_select_exp(char const * query, char const * lang, char ** projection) -> CMPISelectExp
 
 An instance method.
 
@@ -14043,7 +14548,7 @@ _wrap_CMPIBroker_new_select_exp(int argc, VALUE *argv, VALUE self) {
   struct _CMPIBroker *arg1 = (struct _CMPIBroker *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
-  CMPIArray **arg4 = (CMPIArray **) 0 ;
+  char **arg4 = (char **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -14052,8 +14557,6 @@ _wrap_CMPIBroker_new_select_exp(int argc, VALUE *argv, VALUE self) {
   int res3 ;
   char *buf3 = 0 ;
   int alloc3 = 0 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
   CMPISelectExp *result = 0 ;
   VALUE vresult = Qnil;
   
@@ -14075,11 +14578,27 @@ _wrap_CMPIBroker_new_select_exp(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","new_select_exp", 3, argv[1] ));
   }
   arg3 = (char *)(buf3);
-  res4 = SWIG_ConvertPtr(argv[2], &argp4,SWIGTYPE_p_p__CMPIArray, 0 |  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "CMPIArray **","new_select_exp", 4, argv[2] )); 
+  {
+    if (argv[2] == Qnil) {
+      arg4 = NULL;
+    }
+    else {
+      int count, i;
+      rb_check_type(argv[2], T_ARRAY);
+      count = RARRAY_LEN(argv[2]);
+      arg4 = (char **)calloc(count + 1, sizeof(char **)); /* incl. trailing NULL */
+      if (arg4 == NULL) {
+        SWIG_exception(SWIG_MemoryError, "malloc failed");
+      }
+      for (i = 0; i < count; i++) {
+        arg4[i] = (char *)target_charptr(rb_ary_entry(argv[2], i));
+        if (arg4[i] == NULL) {
+          SWIG_exception(SWIG_MemoryError, "malloc failed");
+        }
+      }
+      arg4[i] = NULL;
+    }
   }
-  arg4 = (CMPIArray **)(argp4);
   {
     _clr_raised();
     result = (CMPISelectExp *)_CMPIBroker_new_select_exp(arg1,(char const *)arg2,(char const *)arg3,arg4);
@@ -14097,10 +14616,18 @@ _wrap_CMPIBroker_new_select_exp(int argc, VALUE *argv, VALUE self) {
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p__CMPISelectExp, SWIG_POINTER_OWN |  0 );
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    if (arg4)
+    free(arg4);
+  }
   return vresult;
 fail:
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    if (arg4)
+    free(arg4);
+  }
   return Qnil;
 }
 
@@ -14311,7 +14838,6 @@ static swig_type_info _swigt__p_f_p_q_const__char_p_void___CMPIData = {"_p_f_p_q
 static swig_type_info _swigt__p_float = {"_p_float", "float *|CMPIReal32 *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "int *|CMPISint32 *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_long_long = {"_p_long_long", "CMPISint64 *|long long *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p__CMPIArray = {"_p_p__CMPIArray", "struct _CMPIArray **|CMPIArray **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_void = {"_p_p_void", "CMPIMsgFileHandle *|void **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_short = {"_p_short", "CMPISint16 *|short *", 0, 0, (void*)0, 0};
@@ -14378,7 +14904,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_float,
   &_swigt__p_int,
   &_swigt__p_long_long,
-  &_swigt__p_p__CMPIArray,
   &_swigt__p_p_char,
   &_swigt__p_p_void,
   &_swigt__p_short,
@@ -14445,7 +14970,6 @@ static swig_cast_info _swigc__p_f_p_q_const__char_p_void___CMPIData[] = {  {&_sw
 static swig_cast_info _swigc__p_float[] = {  {&_swigt__p_float, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_long_long[] = {  {&_swigt__p_long_long, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p__CMPIArray[] = {  {&_swigt__p_p__CMPIArray, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_void[] = {  {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_short[] = {  {&_swigt__p_short, 0, 0, 0},{0, 0, 0, 0}};
@@ -14512,7 +15036,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_float,
   _swigc__p_int,
   _swigc__p_long_long,
-  _swigc__p_p__CMPIArray,
   _swigc__p_p_char,
   _swigc__p_p_void,
   _swigc__p_short,
@@ -15318,7 +15841,10 @@ SWIGEXPORT void Init_cmpi(void) {
   
   SwigClassCMPISelectExp.klass = rb_define_class_under(mCmpi, "CMPISelectExp", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p__CMPISelectExp, (void *) &SwigClassCMPISelectExp);
-  rb_undef_alloc_func(SwigClassCMPISelectExp.klass);
+  rb_define_alloc_func(SwigClassCMPISelectExp.klass, _wrap_CMPISelectExp_allocate);
+  rb_define_method(SwigClassCMPISelectExp.klass, "initialize", _wrap_new_CMPISelectExp, -1);
+  rb_define_method(SwigClassCMPISelectExp.klass, "match", _wrap_CMPISelectExp_match, -1);
+  rb_define_method(SwigClassCMPISelectExp.klass, "filter", _wrap_CMPISelectExp_filter, -1);
   rb_define_method(SwigClassCMPISelectExp.klass, "to_s", _wrap_CMPISelectExp_to_s, -1);
   SwigClassCMPISelectExp.mark = 0;
   SwigClassCMPISelectExp.destroy = (void (*)(void *)) free__CMPISelectExp;