* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* gvaluecollector.h: GValue varargs stubs
*/
/**
* SECTION:value_collection
* @Short_description: Converting varargs to generic values
- * @See_also:#GValueTable
* @Title: Varargs Value Collection
*
* The macros in this section provide the varargs parsing support needed
};
-/* vararg union holding actuall values collected
+/* vararg union holding actual values collected
*/
/**
* GTypeCValue:
+ * @v_int: the field for holding integer values
+ * @v_long: the field for holding long integer values
+ * @v_int64: the field for holding 64 bit integer values
+ * @v_double: the field for holding floating point values
+ * @v_pointer: the field for holding pointers
*
* A union holding one collected value.
*/
/**
* G_VALUE_COLLECT_INIT:
- * @value: a #GValue return location. @value is supposed to be clean (freshly
- * initialized and/or freed).
+ * @value: a #GValue return location. @value must contain only 0 bytes.
* @_value_type: the #GType to use for @value.
* @var_args: the va_list variable; it may be evaluated multiple times
* @flags: flags which are passed on to the collect_value() function of
* implement the varargs collection as a macro, because on some systems
* va_list variables cannot be passed by reference.
*
- * Since: 2.23.1
+ * Since: 2.24
*/
#define G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error) \
G_STMT_START { \
- GValue *_value = (value); \
+ GValue *_val = (value); \
guint _flags = (flags); \
- GTypeValueTable *_vtable = g_type_value_table_peek (_value_type); \
- gchar *_collect_format = _vtable->collect_format; \
+ GTypeValueTable *_vtab = g_type_value_table_peek (_value_type); \
+ const gchar *_collect_format = _vtab->collect_format; \
GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, }; \
guint _n_values = 0; \
\
- _value->g_type = _value_type; /* value_meminit() from gvalue.c */ \
+ _val->g_type = _value_type; /* value_meminit() from gvalue.c */ \
while (*_collect_format) \
{ \
GTypeCValue *_cvalue = _cvalues + _n_values++; \
g_assert_not_reached (); \
} \
} \
- *(__error) = _vtable->collect_value (_value, \
+ *(__error) = _vtab->collect_value (_val, \
_n_values, \
_cvalues, \
_flags); \
* va_list variables cannot be passed by reference.
*
* Note: If you are creating the @value argument just before calling this macro,
- * you should use the #G_VALUE_COLLECT_FULL variant and pass the unitialized
+ * you should use the #G_VALUE_COLLECT_INIT variant and pass the unitialized
* #GValue. That variant is faster than #G_VALUE_COLLECT.
*/
#define G_VALUE_COLLECT(value, var_args, flags, __error) G_STMT_START { \
G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error); \
} G_STMT_END
+#define G_VALUE_COLLECT_SKIP(_value_type, var_args) \
+G_STMT_START { \
+ GTypeValueTable *_vtable = g_type_value_table_peek (_value_type); \
+ const gchar *_collect_format = _vtable->collect_format; \
+ \
+ while (*_collect_format) \
+ { \
+ switch (*_collect_format++) \
+ { \
+ case G_VALUE_COLLECT_INT: \
+ va_arg ((var_args), gint); \
+ break; \
+ case G_VALUE_COLLECT_LONG: \
+ va_arg ((var_args), glong); \
+ break; \
+ case G_VALUE_COLLECT_INT64: \
+ va_arg ((var_args), gint64); \
+ break; \
+ case G_VALUE_COLLECT_DOUBLE: \
+ va_arg ((var_args), gdouble); \
+ break; \
+ case G_VALUE_COLLECT_POINTER: \
+ va_arg ((var_args), gpointer); \
+ break; \
+ default: \
+ g_assert_not_reached (); \
+ } \
+ } \
+} G_STMT_END
+
/**
* G_VALUE_LCOPY:
* @value: a #GValue return location. @value is supposed to be initialized
guint _flags = (flags); \
GType _value_type = G_VALUE_TYPE (_value); \
GTypeValueTable *_vtable = g_type_value_table_peek (_value_type); \
- gchar *_lcopy_format = _vtable->lcopy_format; \
+ const gchar *_lcopy_format = _vtable->lcopy_format; \
GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, }; \
guint _n_values = 0; \
\