pwent = getpwnam(username);
- if((tmp = strdup(pwent->pw_gecos)) == NULL)
- return strdup(username);
+ if((tmp = xstrdup(pwent->pw_gecos)) == NULL)
+ return xstrdup(username);
rtn = sscanf(pwent->pw_gecos, "%[^,]", tmp);
if (rtn == EOF || rtn == 0) {
free(tmp);
- return strdup(username);
+ return xstrdup(username);
} else
return tmp;
}
#define LDIF_ITEM_FIELDS 16
-typedef char* ldif_item[LDIF_ITEM_FIELDS];
+typedef char *ldif_item[LDIF_ITEM_FIELDS];
static ldif_item ldif_field_names = {
"cn",
}
static void
-ldif_add_item(ldif_item ldif_item)
+ldif_add_item(ldif_item li)
{
list_item abook_item;
int i;
memset(abook_item, 0, sizeof(abook_item));
- if( !ldif_item[LDIF_ITEM_FIELDS -1] )
+ if(!li[LDIF_ITEM_FIELDS -1] )
goto bail_out;
for(i=0; i < LDIF_ITEM_FIELDS; i++) {
- if(ldif_conv_table[i] >= 0 && ldif_item[i] && *ldif_item[i] )
- abook_item[ldif_conv_table[i]] = strdup(ldif_item[i]);
+ if(ldif_conv_table[i] >= 0 && li[i] && *li[i] )
+ abook_item[ldif_conv_table[i]] = xstrdup(li[i]);
}
add_item2database(abook_item);
bail_out:
for(i=0; i < LDIF_ITEM_FIELDS; i++)
- xfree(ldif_item[i]);
+ xfree(li[i]);
}
break;
if(item[i])
xfree(item[i]);
- item[i] = strdup(value);
+ item[i] = xstrdup(value);
}
}
}
while(ISSPACE(*ptr))
ptr++;
- *rest = strdup(ptr);
+ *rest = xstrdup(ptr);
free(line);
return 0;
strncpy(tmp, start, len);
tmp[len] = 0;
if(*tmp)
- item[pine_conv_table[i]] = strdup(tmp);
+ item[pine_conv_table[i]] = xstrdup(tmp);
}
start = end + 1;
}
char *copy, *trimmed;
int len;
- copy = trimmed = strdup(s);
+ copy = trimmed = xstrdup(s);
strtrim(trimmed);
len = strlen(trimmed);
}
trimmed[len - 1] = 0;
trimmed++;
- trimmed = strdup(trimmed);
+ trimmed = xstrdup(trimmed);
free(copy);
return trimmed;
}
xfree(copy);
- return strdup(s);
+ return xstrdup(s);
}
static void
char *tmp, *pos;
if(database[i][NICK])
- return strdup(database[i][NICK]);
+ return xstrdup(database[i][NICK]);
- tmp = strdup(database[i][NAME]);
+ tmp = xstrdup(database[i][NAME]);
if( ( pos = strchr(tmp, ' ') ) )
*pos = 0;