aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--addressbook/backend/pas/pas-backend-file.c16
2 files changed, 12 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 3811bcaa66..c702f41d31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-28 Chris Toshok <toshok@laptoph.xtoph.org>
+
+ * addressbook/backend/pas/pas-backend-file.c
+ (pas_backend_file_build_all_cards_list): remove unnecessary
+ strdup/free.
+
2000-03-28 Christopher James Lahey <clahey@helixcode.com>
* addressbook/backend/pas/pas-backend-file.c: Removed an infinite
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 5c108f740a..3dd0ced33a 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -221,7 +221,6 @@ pas_backend_file_build_all_cards_list(PASBackend *backend,
DB *db = bf->priv->file_db;
int db_error;
DBT id_dbt, vcard_dbt;
- char *id;
cursor_data->elements = NULL;
@@ -229,16 +228,13 @@ pas_backend_file_build_all_cards_list(PASBackend *backend,
while (db_error == 0) {
- id = g_strndup(id_dbt.data, id_dbt.size);
-
/* don't include the version in the list of cards */
- if (!strcmp (id, PAS_BACKEND_FILE_VERSION_NAME)) {
- g_free(id);
- }
- else {
- g_free(id);
- cursor_data->elements = g_list_append(cursor_data->elements, g_strndup(vcard_dbt.data,
- vcard_dbt.size));
+ if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME)
+ || strncmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME, id_dbt.size)) {
+
+ cursor_data->elements = g_list_append(cursor_data->elements,
+ g_strndup(vcard_dbt.data,
+ vcard_dbt.size));
}
db_error = db->seq(db, &id_dbt, &vcard_dbt, R_NEXT);