#include "misc.h"
#include "options.h"
#include "filter.h"
+#include "xmalloc.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
int i;
for(i=0; i<ITEM_FIELDS; i++)
- my_free(item[i]);
+ xfree(item[i]);
}
void
else
return;
- database = (list_item *)abook_realloc(database,
- sizeof(list_item) * list_capacity);
- selected = (char *)abook_realloc(selected, list_capacity);
+ database = xrealloc(database, sizeof(list_item) * list_capacity);
+ selected = xrealloc(selected, list_capacity);
}
int
ret = e.item;
goto out;
}
- my_free(tmp);
+ xfree(tmp);
}
}
{
char *s;
+ assert(name);
+ assert(i >= 0 && i < ITEM_FIELDS);
+
if(strcasecmp(abook_fields[i].name, name)) { /* name differs */
/*
* check if we are overwriting statically allocated default
*/
if(strcasecmp(abook_fields[i].name, abook_fields[i].key))
- my_free(abook_fields[i].name);
+ xfree(abook_fields[i].name);
- s = abook_malloc(MAX_FIELDNAME_LEN + 1);
+ s = xmalloc_inc(MAX_FIELDNAME_LEN, 1);
snprintf(s, MAX_FIELDNAME_LEN, "%s", name);
abook_fields[i].name = s;
}
int i;
char keyname[21];
+ assert(name);
+
snprintf(keyname, sizeof(keyname), "custom%d", n);
for(i = CUSTOM_MIN; i <= CUSTOM_MAX; i++) {