From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 1/4] lib/open: use local talloc context in n_d_create_with_config
Date: Sat, 6 Mar 2021 09:49:31 -0400 [thread overview]
Message-ID: <20210306134934.491249-2-david@tethera.net> (raw)
In-Reply-To: <20210306134934.491249-1-david@tethera.net>
This better matches the memory allocation semantics in
notmuch_database_open_with_config.
---
lib/open.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/open.cc b/lib/open.cc
index 3b86065b..3b66d2eb 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -423,6 +423,7 @@ notmuch_database_create_with_config (const char *database_path,
GKeyFile *key_file = NULL;
struct stat st;
int err;
+ void *local = talloc_new (NULL);
if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message)))
goto DONE;
@@ -443,7 +444,7 @@ notmuch_database_create_with_config (const char *database_path,
goto DONE;
}
- notmuch_path = talloc_asprintf (NULL, "%s/%s", database_path, ".notmuch");
+ notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch");
err = mkdir (notmuch_path, 0755);
if (err) {
@@ -479,8 +480,7 @@ notmuch_database_create_with_config (const char *database_path,
}
DONE:
- if (notmuch_path)
- talloc_free (notmuch_path);
+ talloc_free (local);
if (message) {
if (status_string)
--
2.30.1
next prev parent reply other threads:[~2021-03-06 13:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-06 13:49 Clean up glib / GKeyFile memory use David Bremner
2021-03-06 13:49 ` David Bremner [this message]
2021-03-06 13:49 ` [PATCH 2/4] lib/open: free value from g_key_file_get_value David Bremner
2021-03-06 13:49 ` [PATCH 3/4] lib/config: free memory from traversing GKeyFile David Bremner
2021-03-06 13:49 ` [PATCH 4/4] lib/open: free GKeyFile David Bremner
2021-03-14 12:53 ` Clean up glib / GKeyFile memory use David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210306134934.491249-2-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).