#include "gras/DataDesc/datadesc_private.h"
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(datadesc,GRAS);
+GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(datadesc,gras,"Data description");
/* FIXME: make this host-dependent using a trick such as UserData*/
gras_set_t *gras_datadesc_set_local=NULL;
VERB0("Initializing DataDesc");
- TRYFAIL(gras_set_new(&gras_datadesc_set_local));
+ gras_datadesc_set_local = gras_set_new();
- TRYFAIL(gras_datadesc_scalar("signed char",
- gras_ddt_scalar_char,
- e_gras_dd_scalar_encoding_sint,
- &ddt));
- TRYFAIL(gras_datadesc_scalar("char",
- gras_ddt_scalar_char,
- e_gras_dd_scalar_encoding_sint,
- &ddt));
- TRYFAIL(gras_datadesc_scalar("unsigned char",
- gras_ddt_scalar_char,
- e_gras_dd_scalar_encoding_uint,
- &ddt));
+ ddt = gras_datadesc_scalar("signed char",
+ gras_ddt_scalar_char,
+ e_gras_dd_scalar_encoding_sint);
+ ddt = gras_datadesc_scalar("char",
+ gras_ddt_scalar_char,
+ e_gras_dd_scalar_encoding_sint);
+ ddt = gras_datadesc_scalar("unsigned char",
+ gras_ddt_scalar_char,
+ e_gras_dd_scalar_encoding_uint);
- TRYFAIL(gras_datadesc_scalar("signed short int",
- gras_ddt_scalar_short,
- e_gras_dd_scalar_encoding_sint,
- &ddt));
- TRYFAIL(gras_datadesc_scalar("short int",
- gras_ddt_scalar_short,
- e_gras_dd_scalar_encoding_sint,
- &ddt));
- TRYFAIL(gras_datadesc_scalar("unsigned short int",
- gras_ddt_scalar_short,
- e_gras_dd_scalar_encoding_uint,
- &ddt));
+ ddt = gras_datadesc_scalar("signed short int",
+ gras_ddt_scalar_short,
+ e_gras_dd_scalar_encoding_sint);
+ ddt = gras_datadesc_scalar("short int",
+ gras_ddt_scalar_short,
+ e_gras_dd_scalar_encoding_sint);
+ ddt = gras_datadesc_scalar("unsigned short int",
+ gras_ddt_scalar_short,
+ e_gras_dd_scalar_encoding_uint);
- TRYFAIL(gras_datadesc_scalar("signed int",
- gras_ddt_scalar_int,
- e_gras_dd_scalar_encoding_sint,
- &ddt));
- TRYFAIL(gras_datadesc_scalar("int",
- gras_ddt_scalar_int,
- e_gras_dd_scalar_encoding_sint,
- &ddt));
- TRYFAIL(gras_datadesc_scalar("unsigned int",
- gras_ddt_scalar_int,
- e_gras_dd_scalar_encoding_uint,
- &ddt));
+ ddt = gras_datadesc_scalar("signed int",
+ gras_ddt_scalar_int,
+ e_gras_dd_scalar_encoding_sint);
+ ddt = gras_datadesc_scalar("int",
+ gras_ddt_scalar_int,
+ e_gras_dd_scalar_encoding_sint);
+ ddt = gras_datadesc_scalar("unsigned int",
+ gras_ddt_scalar_int,
+ e_gras_dd_scalar_encoding_uint);
- TRYFAIL(gras_datadesc_scalar("signed long int",
- gras_ddt_scalar_long,
- e_gras_dd_scalar_encoding_sint,
- &ddt));
- TRYFAIL(gras_datadesc_scalar("long int",
- gras_ddt_scalar_long,
- e_gras_dd_scalar_encoding_sint,
- &ddt));
- TRYFAIL(gras_datadesc_scalar("unsigned long int",
- gras_ddt_scalar_long,
- e_gras_dd_scalar_encoding_uint,
- &ddt));
+ ddt = gras_datadesc_scalar("signed long int",
+ gras_ddt_scalar_long,
+ e_gras_dd_scalar_encoding_sint);
+ ddt = gras_datadesc_scalar("long int",
+ gras_ddt_scalar_long,
+ e_gras_dd_scalar_encoding_sint);
+ ddt = gras_datadesc_scalar("unsigned long int",
+ gras_ddt_scalar_long,
+ e_gras_dd_scalar_encoding_uint);
- TRYFAIL(gras_datadesc_scalar("signed long long int",
- gras_ddt_scalar_long_long,
- e_gras_dd_scalar_encoding_sint,
- &ddt));
- TRYFAIL(gras_datadesc_scalar("long long int",
- gras_ddt_scalar_long_long,
- e_gras_dd_scalar_encoding_sint,
- &ddt));
- TRYFAIL(gras_datadesc_scalar("unsigned long long int",
- gras_ddt_scalar_long_long,
- e_gras_dd_scalar_encoding_uint,
- &ddt));
+ ddt = gras_datadesc_scalar("signed long long int",
+ gras_ddt_scalar_long_long,
+ e_gras_dd_scalar_encoding_sint);
+ ddt = gras_datadesc_scalar("long long int",
+ gras_ddt_scalar_long_long,
+ e_gras_dd_scalar_encoding_sint);
+ ddt = gras_datadesc_scalar("unsigned long long int",
+ gras_ddt_scalar_long_long,
+ e_gras_dd_scalar_encoding_uint);
- TRYFAIL(gras_datadesc_scalar("data pointer",
- gras_ddt_scalar_pdata,
- e_gras_dd_scalar_encoding_uint,
- &ddt));
- TRYFAIL(gras_datadesc_scalar("function pointer",
- gras_ddt_scalar_pfunc,
- e_gras_dd_scalar_encoding_uint,
- &ddt));
+ ddt = gras_datadesc_scalar("data pointer",
+ gras_ddt_scalar_pdata,
+ e_gras_dd_scalar_encoding_uint);
+ ddt = gras_datadesc_scalar("function pointer",
+ gras_ddt_scalar_pfunc,
+ e_gras_dd_scalar_encoding_uint);
- TRYFAIL(gras_datadesc_scalar("float",
- gras_ddt_scalar_float,
- e_gras_dd_scalar_encoding_float,
- &ddt));
- TRYFAIL(gras_datadesc_scalar("double",
- gras_ddt_scalar_double,
- e_gras_dd_scalar_encoding_float,
- &ddt));
-
- TRYFAIL(gras_datadesc_array_dyn("char[]",
- gras_datadesc_by_name("char"),
- _strlen_cb,&ddt));
- TRYFAIL(gras_datadesc_ref("string",
- gras_datadesc_by_name("char[]"),
- &ddt));
+ ddt = gras_datadesc_scalar("float",
+ gras_ddt_scalar_float,
+ e_gras_dd_scalar_encoding_float);
+ ddt = gras_datadesc_scalar("double",
+ gras_ddt_scalar_double,
+ e_gras_dd_scalar_encoding_float);
+
+ ddt = gras_datadesc_array_dyn("char[]",
+ gras_datadesc_by_name("char"),
+ _strlen_cb);
+ ddt = gras_datadesc_ref("string",ddt);
}
