X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=filter.c;h=e1111e3724b9fb4874b011cf5a6376405586242a;hb=781c0d657fffe80e45d0fda6ed5ddbf5f796fefb;hp=9eb96192243f41461432d21bbc3ed63ae55a28c2;hpb=ef379a20d142cb95ba08c7887c8e3245269b3fdd;p=pkg%2Fabook.git

diff --git a/filter.c b/filter.c
index 9eb9619..e1111e3 100644
--- a/filter.c
+++ b/filter.c
@@ -145,13 +145,13 @@ get_real_name()
 
 	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;
 }
@@ -431,7 +431,7 @@ static void	ldif_fix_string(char *str);
 
 #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",
@@ -519,27 +519,27 @@ ldif_read_line(FILE *in)
 }
 
 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]);
 
 }
 
@@ -560,7 +560,7 @@ ldif_convert(ldif_item item, char *type, char *value)
 					break;
 			if(item[i])
 				xfree(item[i]);
-			item[i] = strdup(value);
+			item[i] = xstrdup(value);
 		}
 	}
 }
@@ -656,7 +656,7 @@ mutt_read_line(FILE *in, char **alias, char **rest)
 	while(ISSPACE(*ptr))
 		ptr++;
 
-	*rest = strdup(ptr);
+	*rest = xstrdup(ptr);
 
 	free(line);
 	return 0;
@@ -948,7 +948,7 @@ pine_parse_buf(char *buf)
 			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;
 	}
@@ -1098,7 +1098,7 @@ csv_remove_quotes(char *s)
 	char *copy, *trimmed;
 	int len;
 
-	copy = trimmed = strdup(s);
+	copy = trimmed = xstrdup(s);
 	strtrim(trimmed);
 
 	len = strlen(trimmed);
@@ -1109,13 +1109,13 @@ csv_remove_quotes(char *s)
 		}
 		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
@@ -1576,9 +1576,9 @@ mutt_alias_genalias(int i)
 	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;