debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the talloc_owner argument from create_for_message_id.

Browse source 
This function has only one caller, and that one caller was passing the
same value for both talloc_owner and the notmuch database. Dropping
the redundant argument simplifies the documentation of this function
considerably.
This commit is contained in:
Carl Worth 2009-11-17 11:02:33 -08:00
parent 387828c435
commit 24a25ffba9
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/database.cc
View file

@ -912,7 +912,6 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
* database). */ * database). */
message = _notmuch_message_create_for_message_id (notmuch, message = _notmuch_message_create_for_message_id (notmuch,
notmuch,
message_id, message_id,
&private_status); &private_status);

18
lib/message.cc
View file

@ -148,15 +148,8 @@ _notmuch_message_create (const void *talloc_owner,
/* Create a new notmuch_message_t object for a specific message ID, /* Create a new notmuch_message_t object for a specific message ID,
* (which may or may not already exist in the databas). * (which may or may not already exist in the databas).
* *
* Here, 'talloc owner' is an optional talloc context to which the new * The 'notmuch' database will be the talloc owner of the returned
* message will belong. This allows for the caller to not bother * message.
* calling notmuch_message_destroy on the message, and no that all
* memory will be reclaimed with 'talloc_owner' is free. The caller
* still can call notmuch_message_destroy when finished with the
* message if desired.
*
* The 'talloc_owner' argument can also be NULL, in which case the
* caller *is* responsible for calling notmuch_message_destroy.
* *
* If there is already a document with message ID 'message_id' in the * If there is already a document with message ID 'message_id' in the
* database, then the returned message can be used to query/modify the * database, then the returned message can be used to query/modify the
@ -169,8 +162,7 @@ _notmuch_message_create (const void *talloc_owner,
* not be NULL.) * not be NULL.)
*/ */
notmuch_message_t * notmuch_message_t *
_notmuch_message_create_for_message_id (const void *talloc_owner, _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
notmuch_database_t *notmuch,
const char *message_id, const char *message_id,
notmuch_private_status_t *status_ret) notmuch_private_status_t *status_ret)
{ {
@ -183,7 +175,7 @@ _notmuch_message_create_for_message_id (const void *talloc_owner,
message = notmuch_database_find_message (notmuch, message_id); message = notmuch_database_find_message (notmuch, message_id);
if (message) if (message)
return talloc_steal (talloc_owner, message); return talloc_steal (notmuch, message);
term = talloc_asprintf (NULL, "%s%s", term = talloc_asprintf (NULL, "%s%s",
_find_prefix ("id"), message_id); _find_prefix ("id"), message_id);
@ -204,7 +196,7 @@ _notmuch_message_create_for_message_id (const void *talloc_owner,
return NULL; return NULL;
} }
message = _notmuch_message_create (talloc_owner, notmuch, message = _notmuch_message_create (notmuch, notmuch,
doc_id, status_ret); doc_id, status_ret);
/* We want to inform the caller that we had to create a new /* We want to inform the caller that we had to create a new

3
lib/notmuch-private.h
View file

@ -167,8 +167,7 @@ _notmuch_message_create (const void *talloc_owner,
notmuch_private_status_t *status); notmuch_private_status_t *status);
notmuch_message_t * notmuch_message_t *
_notmuch_message_create_for_message_id (const void *talloc_owner, _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
notmuch_database_t *notmuch,
const char *message_id, const char *message_id,
notmuch_private_status_t *status); notmuch_private_status_t *status);