debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-03 07:11:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove all calls to g_strdup_printf

Browse source 
Replacing them with calls to talloc_asprintf if possible, otherwise
to asprintf (with it's painful error-handling leaving the pointer
undefined).
This commit is contained in:
Carl Worth 2009-10-26 15:17:10 -07:00
parent 94f01d9de9
commit 8e96a87fff
4 changed files with 65 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
database.cc
View file

@ -24,7 +24,7 @@
#include <xapian.h> #include <xapian.h>
#include <glib.h> /* g_strdup_printf, g_free, GPtrArray, GHashTable */ #include <glib.h> /* g_free, GPtrArray, GHashTable */
using namespace std; using namespace std;
@ -182,13 +182,14 @@ find_doc_ids (notmuch_database_t *notmuch,
Xapian::PostingIterator i; Xapian::PostingIterator i;
char *term; char *term;
term = g_strdup_printf ("%s%s", _find_prefix (prefix_name), value); term = talloc_asprintf (notmuch, "%s%s",
_find_prefix (prefix_name), value);
*begin = notmuch->xapian_db->postlist_begin (term); *begin = notmuch->xapian_db->postlist_begin (term);
*end = notmuch->xapian_db->postlist_end (term); *end = notmuch->xapian_db->postlist_end (term);
free (term); talloc_free (term);
} }
static notmuch_private_status_t static notmuch_private_status_t
@ -293,12 +294,11 @@ skip_space_and_comments (const char **str)
* If not NULL, then *next will be made to point to the first character * If not NULL, then *next will be made to point to the first character
* not parsed, (possibly pointing to the final '\0' terminator. * not parsed, (possibly pointing to the final '\0' terminator.
* *
* Returns a newly allocated string which the caller should free() * Returns a newly talloc'ed string belonging to 'ctx'.
* when done with it.
* *
* Returns NULL if there is any error parsing the message-id. */ * Returns NULL if there is any error parsing the message-id. */
static char * static char *
parse_message_id (const char *message_id, const char **next) parse_message_id (void *ctx, const char *message_id, const char **next)
{ {
const char *s, *end; const char *s, *end;
char *result; char *result;
@ -339,7 +339,7 @@ parse_message_id (const char *message_id, const char **next)
if (end <= s) if (end <= s)
return NULL; return NULL;
result = strndup (s, end - s + 1); result = talloc_strndup (ctx, s, end - s + 1);
/* Finally, collapse any whitespace that is within the message-id /* Finally, collapse any whitespace that is within the message-id
* itself. */ * itself. */
@ -355,10 +355,11 @@ parse_message_id (const char *message_id, const char **next)
return result; return result;
} }
/* Parse a References header value, putting a copy of each referenced /* Parse a References header value, putting a (talloc'ed under 'ctx')
* message-id into 'hash'. */ * copy of each referenced message-id into 'hash'. */
static void static void
parse_references (GHashTable *hash, parse_references (void *ctx,
GHashTable *hash,
const char *refs) const char *refs)
{ {
char *ref; char *ref;
@ -367,7 +368,7 @@ parse_references (GHashTable *hash,
return; return;
while (*refs) { while (*refs) {
ref = parse_message_id (refs, &refs); ref = parse_message_id (ctx, refs, &refs);
if (ref) if (ref)
g_hash_table_insert (hash, ref, NULL); g_hash_table_insert (hash, ref, NULL);
@ -377,10 +378,17 @@ parse_references (GHashTable *hash,
char * char *
notmuch_database_default_path (void) notmuch_database_default_path (void)
{ {
char *path;
if (getenv ("NOTMUCH_BASE")) if (getenv ("NOTMUCH_BASE"))
return strdup (getenv ("NOTMUCH_BASE")); return strdup (getenv ("NOTMUCH_BASE"));
return g_strdup_printf ("%s/mail", getenv ("HOME")); if (asprintf (&path, "%s/mail", getenv ("HOME")) == -1) {
fprintf (stderr, "Out of memory.\n");
return xstrdup("");
}
return path;
} }
notmuch_database_t * notmuch_database_t *
@ -408,7 +416,7 @@ notmuch_database_create (const char *path)
goto DONE; goto DONE;
} }
notmuch_path = g_strdup_printf ("%s/%s", path, ".notmuch"); notmuch_path = talloc_asprintf (NULL, "%s/%s", path, ".notmuch");
err = mkdir (notmuch_path, 0755); err = mkdir (notmuch_path, 0755);
@ -422,7 +430,7 @@ notmuch_database_create (const char *path)
DONE: DONE:
if (notmuch_path) if (notmuch_path)
free (notmuch_path); talloc_free (notmuch_path);
if (local_path) if (local_path)
free (local_path); free (local_path);
@ -442,7 +450,11 @@ notmuch_database_open (const char *path)
if (path == NULL) if (path == NULL)
path = local_path = notmuch_database_default_path (); path = local_path = notmuch_database_default_path ();
notmuch_path = g_strdup_printf ("%s/%s", path, ".notmuch"); if (asprintf (&notmuch_path, "%s/%s", path, ".notmuch") == -1) {
notmuch_path = NULL;
fprintf (stderr, "Out of memory\n");
goto DONE;
}
err = stat (notmuch_path, &st); err = stat (notmuch_path, &st);
if (err) { if (err) {
@ -451,7 +463,11 @@ notmuch_database_open (const char *path)
goto DONE; goto DONE;
} }
xapian_path = g_strdup_printf ("%s/%s", notmuch_path, "xapian"); if (asprintf (&xapian_path, "%s/%s", notmuch_path, "xapian") == -1) {
xapian_path = NULL;
fprintf (stderr, "Out of memory\n");
goto DONE;
}
notmuch = talloc (NULL, notmuch_database_t); notmuch = talloc (NULL, notmuch_database_t);
notmuch->path = talloc_strdup (notmuch, path); notmuch->path = talloc_strdup (notmuch, path);
@ -659,6 +675,12 @@ _merge_threads (notmuch_database_t *notmuch,
return ret; return ret;
} }
static void
_my_talloc_free_for_g_hash (void *ptr)
{
talloc_free (ptr);
}
static notmuch_status_t static notmuch_status_t
_notmuch_database_link_message_to_parents (notmuch_database_t *notmuch, _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
notmuch_message_t *message, notmuch_message_t *message,
@ -671,13 +693,13 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
parents = g_hash_table_new_full (g_str_hash, g_str_equal, parents = g_hash_table_new_full (g_str_hash, g_str_equal,
free, NULL); _my_talloc_free_for_g_hash, NULL);
refs = notmuch_message_file_get_header (message_file, "references"); refs = notmuch_message_file_get_header (message_file, "references");
parse_references (parents, refs); parse_references (message, parents, refs);
in_reply_to = notmuch_message_file_get_header (message_file, "in-reply-to"); in_reply_to = notmuch_message_file_get_header (message_file, "in-reply-to");
parse_references (parents, in_reply_to); parse_references (message, parents, in_reply_to);
keys = g_hash_table_get_keys (parents); keys = g_hash_table_get_keys (parents);
for (l = keys; l; l = l->next) { for (l = keys; l; l = l->next) {
@ -830,11 +852,11 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
header = notmuch_message_file_get_header (message_file, "message-id"); header = notmuch_message_file_get_header (message_file, "message-id");
if (header) { if (header) {
message_id = parse_message_id (header, NULL); message_id = parse_message_id (message_file, header, NULL);
/* So the header value isn't RFC-compliant, but it's /* So the header value isn't RFC-compliant, but it's
* better than no message-id at all. */ * better than no message-id at all. */
if (message_id == NULL) if (message_id == NULL)
message_id = xstrdup (header); message_id = talloc_strdup (message_file, header);
} else { } else {
/* No message-id at all, let's generate one by taking a /* No message-id at all, let's generate one by taking a
* hash over the file's contents. */ * hash over the file's contents. */
@ -846,7 +868,8 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
goto DONE; goto DONE;
} }
message_id = g_strdup_printf ("notmuch-sha1-%s", sha1); message_id = talloc_asprintf (message_file,
"notmuch-sha1-%s", sha1);
free (sha1); free (sha1);
} }
@ -859,7 +882,8 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
notmuch, notmuch,
message_id, message_id,
&ret); &ret);
free (message_id);
talloc_free (message_id);
if (message == NULL) if (message == NULL)
goto DONE; goto DONE;

4
message-file.c
View file

@ -75,7 +75,7 @@ notmuch_message_file_open (const char *filename)
{ {
notmuch_message_file_t *message; notmuch_message_file_t *message;
message = xcalloc (1, sizeof (notmuch_message_file_t)); message = talloc_zero (NULL, notmuch_message_file_t);
message->file = fopen (filename, "r"); message->file = fopen (filename, "r");
if (message->file == NULL) if (message->file == NULL)
@ -116,7 +116,7 @@ notmuch_message_file_close (notmuch_message_file_t *message)
if (message->file) if (message->file)
fclose (message->file); fclose (message->file);
free (message); talloc_free (message);
} }
void void

2
notmuch-private.h
View file

@ -22,7 +22,7 @@
#define NOTMUCH_PRIVATE_H #define NOTMUCH_PRIVATE_H
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
#define _GNU_SOURCE /* For getline */ #define _GNU_SOURCE /* For getline and asprintf */
#endif #endif
#include <stdio.h> #include <stdio.h>

23
notmuch.c
View file

@ -41,8 +41,6 @@
#include <talloc.h> #include <talloc.h>
#include <glib.h> /* g_strdup_printf */
#define unused(x) x __attribute__ ((unused)) #define unused(x) x __attribute__ ((unused))
/* There's no point in continuing when we've detected that we've done /* There's no point in continuing when we've detected that we've done
@ -236,7 +234,7 @@ add_files_recursive (notmuch_database_t *notmuch,
continue; continue;
} }
next = g_strdup_printf ("%s/%s", path, entry->d_name); next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
if (stat (next, st)) { if (stat (next, st)) {
fprintf (stderr, "Error reading %s: %s\n", fprintf (stderr, "Error reading %s: %s\n",
@ -289,7 +287,7 @@ add_files_recursive (notmuch_database_t *notmuch,
ret = status; ret = status;
} }
free (next); talloc_free (next);
next = NULL; next = NULL;
} }
@ -299,7 +297,7 @@ add_files_recursive (notmuch_database_t *notmuch,
DONE: DONE:
if (next) if (next)
free (next); talloc_free (next);
if (entry) if (entry)
free (entry); free (entry);
if (dir) if (dir)
@ -342,7 +340,7 @@ static void
count_files (const char *path, int *count) count_files (const char *path, int *count)
{ {
DIR *dir; DIR *dir;
struct dirent *entry, *e; struct dirent *e, *entry = NULL;
int entry_length; int entry_length;
int err; int err;
char *next; char *next;
@ -353,7 +351,7 @@ count_files (const char *path, int *count)
if (dir == NULL) { if (dir == NULL) {
fprintf (stderr, "Warning: failed to open directory %s: %s\n", fprintf (stderr, "Warning: failed to open directory %s: %s\n",
path, strerror (errno)); path, strerror (errno));
return; goto DONE;
} }
entry_length = offsetof (struct dirent, d_name) + entry_length = offsetof (struct dirent, d_name) +
@ -366,7 +364,7 @@ count_files (const char *path, int *count)
fprintf (stderr, "Error reading directory: %s\n", fprintf (stderr, "Error reading directory: %s\n",
strerror (errno)); strerror (errno));
free (entry); free (entry);
return; goto DONE;
} }
if (e == NULL) if (e == NULL)
@ -384,7 +382,12 @@ count_files (const char *path, int *count)
continue; continue;
} }
next = g_strdup_printf ("%s/%s", path, entry->d_name); if (asprintf (&next, "%s/%s", path, entry->d_name) == -1) {
next = NULL;
fprintf (stderr, "Error descending from %s to %s: Out of memory\n",
path, entry->d_name);
continue;
}
stat (next, &st); stat (next, &st);
@ -401,6 +404,8 @@ count_files (const char *path, int *count)
free (next); free (next);
} }
DONE:
if (entry)
free (entry); free (entry);
closedir (dir); closedir (dir);