#include "list.h"
#include "misc.h"
#include "options.h"
+#include "xmalloc.h"
#include <assert.h>
extern int items;
bail_out:
for(i=0; i < LDIF_ITEM_FIELDS; i++)
- my_free(ldif_item[i]);
+ xfree(ldif_item[i]);
}
if( safe_strcmp("person", value))
break;
if(item[i])
- my_free(item[i]);
+ xfree(item[i]);
item[i] = strdup(value);
}
}
continue;
if( -1 == ( str_parse_line(line, &type, &value, &vlen)) ) {
- my_free(line);
+ xfree(line);
continue; /* just skip the errors */
}
ldif_convert(item, type, value);
- my_free(line);
+ xfree(line);
} while ( !feof(handle) );
ldif_convert(item, "dn", "");
while( ! ISSPACE(*ptr) )
ptr++;
- /* includes also the trailing zero */
- alias_len = (size_t)(ptr - tmp + 1);
+ alias_len = (size_t)(ptr - tmp);
- if( (*alias = (char *)malloc(alias_len)) == NULL) {
- free(line);
- return 1;
- }
+ *alias = xmalloc_inc(alias_len, 1);
- strncpy(*alias, tmp, alias_len - 1);
- *(*alias + alias_len - 1) = 0;
+ strncpy(*alias, tmp, alias_len);
+ *(*alias + alias_len) = 0;
while(ISSPACE(*ptr))
ptr++;
free(item[EMAIL]);
item[EMAIL] = tmp;
} else {
- my_free(email);
+ xfree(email);
}
}
}
int i, len, last;
int pine_conv_table[]= {NICK, NAME, EMAIL, -1, NOTES};
- memset(&item, 0, sizeof(item) );
+ memset(&item, 0, sizeof(item));
for(i=0, last=0; !last ; i++) {
if( ! (end = strchr(start, '\t')) )
while(!feof(in)) {
for(i = 2;;i++) {
- buf = (char *) realloc(buf, i*LINESIZE);
+ buf = xrealloc(buf, i*LINESIZE);
if(i == 2)
strcpy(buf, line);
fgets(line, LINESIZE, in);
strcat(buf, ptr);
}
if( *buf == '#' ) {
- my_free(buf);
+ xfree(buf);
continue;
}
pine_fixbuf(buf);
pine_parse_buf(buf);
- my_free(buf);
+ xfree(buf);
}
return 0;
len = strlen(trimmed);
if(trimmed[len - 1] == '\"' && *trimmed == '\"') {
if(len < 3) {
- my_free(copy);
+ xfree(copy);
return NULL;
}
trimmed[len - 1] = 0;
return trimmed;
}
- my_free(copy);
+ xfree(copy);
return strdup(s);
}
&& csv_conv_table[field] >= 0) {
item[csv_conv_table[field]] = newstr;
} else {
- my_free(newstr);
+ xfree(newstr);
}
}
&& allcsv_conv_table[field] >= 0) {
item[allcsv_conv_table[field]] = newstr;
} else {
- my_free(newstr);
+ xfree(newstr);
}
}
if(line && *line && *line != CSV_COMMENT_CHAR)
csv_parse_line(line);
- my_free(line);
+ xfree(line);
}
return 0;
if(line && *line && *line != CSV_COMMENT_CHAR)
allcsv_parse_line(line);
- my_free(line);
+ xfree(line);
}
return 0;
static int
allcsv_export_database(FILE *out, struct db_enumerator e)
{
+ /*
+ * TODO: Should get these atomatically from abook_fileds
+ * - JH
+ */
int allcsv_export_fields[] = {
NAME,
EMAIL,
alias,
database[e.item][NAME],
email);
- my_free(alias);
+ xfree(alias);
}
return 0;
alias,
database[e.item][NAME],
email);
- my_free(alias);
+ xfree(alias);
}
return 0;