#include "xbt/ex.h"
#include "xbt/dynar.h"
#include "xbt/dict.h"
+#include "xbt/host.h"
#include "xbt/config.h" /* prototypes of this module */
static void xbt_cfg_str_free(void *d){
free(*(void**)d);
}
-static void xbt_cfg_host_free(void *d){
- xbt_host_t *h=(xbt_host_t*) *(void**)d;
- if (h) {
- if (h->name) free(h->name);
- free(h);
- }
-}
/*----[ Memory management ]-----------------------------------------------*/
int ival;
char *sval;
double dval;
- xbt_host_t *hval;
+ xbt_host_t hval;
if (name)
printf("%s>> Dumping of the config set '%s':\n",indent,name);
case xbt_cfgelm_host:
for (i=0; i<size; i++) {
- hval = xbt_dynar_get_as(variable->content,i,xbt_host_t*);
+ hval = xbt_dynar_get_as(variable->content,i,xbt_host_t);
printf ("%s %s:%d\n",indent,hval->name,hval->port);
}
break;
break;
case xbt_cfgelm_host:
- res->content = xbt_dynar_new(sizeof(xbt_host_t*),&xbt_cfg_host_free);
+ res->content = xbt_dynar_new(sizeof(xbt_host_t),&xbt_host_free_voidp);
break;
default:
xbt_cfg_set_host(xbt_cfg_t cfg,const char*name,
const char *host,int port) {
xbt_cfgelm_t variable;
- xbt_host_t *val=xbt_new(xbt_host_t,1);
+ xbt_host_t val=xbt_host_new(host,port);
VERB3("Configuration setting: %s=%s:%d",name,host,port);
- val->name = xbt_strdup(name);
- val->port = port;
-
variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_host);
if (variable->max == 1) {
xbt_cfg_rm_host(xbt_cfg_t cfg,const char*name, const char *host,int port) {
xbt_cfgelm_t variable;
int cpt;
- xbt_host_t *seen;
+ xbt_host_t seen;
variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_host);
void xbt_cfg_get_host (xbt_cfg_t cfg, const char *name,
char **host, int *port) {
xbt_cfgelm_t variable;
- xbt_host_t *val;
+ xbt_host_t val;
variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_host);
name, xbt_dynar_length(variable->content));
}
- val = xbt_dynar_get_as(variable->content, 0, xbt_host_t*);
+ val = xbt_dynar_get_as(variable->content, 0, xbt_host_t);
*host=val->name;
*port=val->port;
}
char **host, int *port) {
xbt_cfgelm_t variable = xbt_cfgelm_get(cfg,name,xbt_cfgelm_int);
- xbt_host_t *val = xbt_dynar_get_ptr(variable->content, pos);
+ xbt_host_t val = xbt_dynar_get_ptr(variable->content, pos);
*port = val->port;
*host = val->name;
{
/* non-existant_entry */
xbt_cfg_t myset=make_set();
+ xbt_ex_t e;
TRY {
xbt_cfg_set_parse(myset, "color:blue");
} CATCH(e) {
- if (e.category != mismatch_error)
+ if (e.category != not_found_error)
xbt_test_exception(e);
xbt_ex_free(e);
}