[PATCH 1/1] lib/message-file.c: use g_malloc () & g_free () in hash table values

[David Bremner]

Tomi Ollila  writes:

>
> The remaining frees and allocations referencing to message->headers hash
> values have been changed to use g_free and g_malloc functions.
>

pushed,

d

[PATCH 1/1] lib/message-file.c: use g_malloc () & g_free () in hash table values

[Austin Clements]

LGTM.

On Fri, 21 Dec 2012, Tomi Ollila  wrote:
> The message->headers hash table values get data returned by
> g_mime_utils_header_decode_text ().
>
> The pointer returned by g_mime_utils_header_decode_text is from the
> following line in rfc2047_decode_tokens
>
> return g_string_free (decoded, FALSE);
>
> The docs for g_string_free say
>
>  Frees the memory allocated for the GString. If free_segment is TRUE
>  it also frees the character data. If it's FALSE, the caller gains
>  ownership of the buffer and must free it after use with g_free().
>
> The remaining frees and allocations referencing to message->headers hash
> values have been changed to use g_free and g_malloc functions.
>
> This combines and completes the changes started by David Bremner.
> ---
>
> This was meant to be in reply to id:87mwxkptqn.fsf at zancas.localnet
> but I fumbled it. ;)
>
>  lib/message-file.c | 8 
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/message-file.c b/lib/message-file.c
> index 915aba8..4d9af89 100644
> --- a/lib/message-file.c
> +++ b/lib/message-file.c
> @@ -111,7 +111,7 @@ _notmuch_message_file_open_ctx (void *ctx, const char 
> *filename)
>  message->headers = g_hash_table_new_full (strcase_hash,
> strcase_equal,
> free,
> -   free);
> +   g_free);
>  
>  message->parsing_started = 0;
>  message->parsing_finished = 0;
> @@ -337,11 +337,11 @@ notmuch_message_file_get_header (notmuch_message_file_t 
> *message,
>   /* we need to add the header to those we already collected */
>   newhdr = strlen(decoded_value);
>   hdrsofar = strlen(header_sofar);
> - combined_header = xmalloc(hdrsofar + newhdr + 2);
> + combined_header = g_malloc(hdrsofar + newhdr + 2);
>   strncpy(combined_header,header_sofar,hdrsofar);
>   *(combined_header+hdrsofar) = ' ';
>   strncpy(combined_header+hdrsofar+1,decoded_value,newhdr+1);
> - free (decoded_value);
> + g_free (decoded_value);
>   g_hash_table_insert (message->headers, header, combined_header);
>   }
>   } else {
> @@ -350,7 +350,7 @@ notmuch_message_file_get_header (notmuch_message_file_t 
> *message,
>   g_hash_table_insert (message->headers, header, decoded_value);
>   } else {
>   free (header);
> - free (decoded_value);
> + g_free (decoded_value);
>   decoded_value = header_sofar;
>   }
>   }
> -- 
> 1.8.0
>
> ___
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH 1/1] lib/message-file.c: use g_malloc () g_free () in hash table values

[Austin Clements]

LGTM.

On Fri, 21 Dec 2012, Tomi Ollila tomi.oll...@iki.fi wrote:
 The message-headers hash table values get data returned by
 g_mime_utils_header_decode_text ().

 The pointer returned by g_mime_utils_header_decode_text is from the
 following line in rfc2047_decode_tokens

 return g_string_free (decoded, FALSE);

 The docs for g_string_free say

  Frees the memory allocated for the GString. If free_segment is TRUE
  it also frees the character data. If it's FALSE, the caller gains
  ownership of the buffer and must free it after use with g_free().

 The remaining frees and allocations referencing to message-headers hash
 values have been changed to use g_free and g_malloc functions.

 This combines and completes the changes started by David Bremner.
 ---

 This was meant to be in reply to id:87mwxkptqn.fsf@zancas.localnet
 but I fumbled it. ;)

  lib/message-file.c | 8 
  1 file changed, 4 insertions(+), 4 deletions(-)

 diff --git a/lib/message-file.c b/lib/message-file.c
 index 915aba8..4d9af89 100644
 --- a/lib/message-file.c
 +++ b/lib/message-file.c
 @@ -111,7 +111,7 @@ _notmuch_message_file_open_ctx (void *ctx, const char 
 *filename)
  message-headers = g_hash_table_new_full (strcase_hash,
 strcase_equal,
 free,
 -   free);
 +   g_free);
  
  message-parsing_started = 0;
  message-parsing_finished = 0;
 @@ -337,11 +337,11 @@ notmuch_message_file_get_header (notmuch_message_file_t 
 *message,
   /* we need to add the header to those we already collected */
   newhdr = strlen(decoded_value);
   hdrsofar = strlen(header_sofar);
 - combined_header = xmalloc(hdrsofar + newhdr + 2);
 + combined_header = g_malloc(hdrsofar + newhdr + 2);
   strncpy(combined_header,header_sofar,hdrsofar);
   *(combined_header+hdrsofar) = ' ';
   strncpy(combined_header+hdrsofar+1,decoded_value,newhdr+1);
 - free (decoded_value);
 + g_free (decoded_value);
   g_hash_table_insert (message-headers, header, combined_header);
   }
   } else {
 @@ -350,7 +350,7 @@ notmuch_message_file_get_header (notmuch_message_file_t 
 *message,
   g_hash_table_insert (message-headers, header, decoded_value);
   } else {
   free (header);
 - free (decoded_value);
 + g_free (decoded_value);
   decoded_value = header_sofar;
   }
   }
 -- 
 1.8.0

 ___
 notmuch mailing list
 notmuch@notmuchmail.org
 http://notmuchmail.org/mailman/listinfo/notmuch
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH 1/1] lib/message-file.c: use g_malloc () g_free () in hash table values

[David Bremner]

Tomi Ollila tomi.oll...@iki.fi writes:


 The remaining frees and allocations referencing to message-headers hash
 values have been changed to use g_free and g_malloc functions.


pushed,

d
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

[PATCH 1/1] lib/message-file.c: use g_malloc () & g_free () in hash table values

[David Bremner]

Tomi Ollila  writes:

> @@ -111,7 +111,7 @@ _notmuch_message_file_open_ctx (void *ctx, const char 
> *filename)
>  message->headers = g_hash_table_new_full (strcase_hash,
> strcase_equal,
> free,
> -   free);
> +   g_free);

It slightly icky that the keys in this hash table are allocated/freed
with (x)malloc/(x)free, and the values with g_malloc/g_free, but that's
not your fault, and it's an improvement on what we had before, so +1
from me.

d

Re: [PATCH 1/1] lib/message-file.c: use g_malloc () g_free () in hash table values

[David Bremner]

Tomi Ollila tomi.oll...@iki.fi writes:

 @@ -111,7 +111,7 @@ _notmuch_message_file_open_ctx (void *ctx, const char 
 *filename)
  message-headers = g_hash_table_new_full (strcase_hash,
 strcase_equal,
 free,
 -   free);
 +   g_free);

It slightly icky that the keys in this hash table are allocated/freed
with (x)malloc/(x)free, and the values with g_malloc/g_free, but that's
not your fault, and it's an improvement on what we had before, so +1
from me.

d


___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

[PATCH 1/1] lib/message-file.c: use g_malloc () & g_free () in hash table values

[Tomi Ollila]

The message->headers hash table values get data returned by
g_mime_utils_header_decode_text ().

The pointer returned by g_mime_utils_header_decode_text is from the
following line in rfc2047_decode_tokens

return g_string_free (decoded, FALSE);

The docs for g_string_free say

 Frees the memory allocated for the GString. If free_segment is TRUE
 it also frees the character data. If it's FALSE, the caller gains
 ownership of the buffer and must free it after use with g_free().

The remaining frees and allocations referencing to message->headers hash
values have been changed to use g_free and g_malloc functions.

This combines and completes the changes started by David Bremner.
---

This was meant to be in reply to id:87mwxkptqn.fsf at zancas.localnet
but I fumbled it. ;)

 lib/message-file.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/message-file.c b/lib/message-file.c
index 915aba8..4d9af89 100644
--- a/lib/message-file.c
+++ b/lib/message-file.c
@@ -111,7 +111,7 @@ _notmuch_message_file_open_ctx (void *ctx, const char 
*filename)
 message->headers = g_hash_table_new_full (strcase_hash,
  strcase_equal,
  free,
- free);
+ g_free);

 message->parsing_started = 0;
 message->parsing_finished = 0;
@@ -337,11 +337,11 @@ notmuch_message_file_get_header (notmuch_message_file_t 
*message,
/* we need to add the header to those we already collected */
newhdr = strlen(decoded_value);
hdrsofar = strlen(header_sofar);
-   combined_header = xmalloc(hdrsofar + newhdr + 2);
+   combined_header = g_malloc(hdrsofar + newhdr + 2);
strncpy(combined_header,header_sofar,hdrsofar);
*(combined_header+hdrsofar) = ' ';
strncpy(combined_header+hdrsofar+1,decoded_value,newhdr+1);
-   free (decoded_value);
+   g_free (decoded_value);
g_hash_table_insert (message->headers, header, combined_header);
}
} else {
@@ -350,7 +350,7 @@ notmuch_message_file_get_header (notmuch_message_file_t 
*message,
g_hash_table_insert (message->headers, header, decoded_value);
} else {
free (header);
-   free (decoded_value);
+   g_free (decoded_value);
decoded_value = header_sofar;
}
}
-- 
1.8.0

[PATCH 1/1] lib/message-file.c: use g_malloc () g_free () in hash table values

[Tomi Ollila]

The message-headers hash table values get data returned by
g_mime_utils_header_decode_text ().

The pointer returned by g_mime_utils_header_decode_text is from the
following line in rfc2047_decode_tokens

return g_string_free (decoded, FALSE);

The docs for g_string_free say

 Frees the memory allocated for the GString. If free_segment is TRUE
 it also frees the character data. If it's FALSE, the caller gains
 ownership of the buffer and must free it after use with g_free().

The remaining frees and allocations referencing to message-headers hash
values have been changed to use g_free and g_malloc functions.

This combines and completes the changes started by David Bremner.
---

This was meant to be in reply to id:87mwxkptqn.fsf@zancas.localnet
but I fumbled it. ;)

 lib/message-file.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/message-file.c b/lib/message-file.c
index 915aba8..4d9af89 100644
--- a/lib/message-file.c
+++ b/lib/message-file.c
@@ -111,7 +111,7 @@ _notmuch_message_file_open_ctx (void *ctx, const char 
*filename)
 message-headers = g_hash_table_new_full (strcase_hash,
  strcase_equal,
  free,
- free);
+ g_free);
 
 message-parsing_started = 0;
 message-parsing_finished = 0;
@@ -337,11 +337,11 @@ notmuch_message_file_get_header (notmuch_message_file_t 
*message,
/* we need to add the header to those we already collected */
newhdr = strlen(decoded_value);
hdrsofar = strlen(header_sofar);
-   combined_header = xmalloc(hdrsofar + newhdr + 2);
+   combined_header = g_malloc(hdrsofar + newhdr + 2);
strncpy(combined_header,header_sofar,hdrsofar);
*(combined_header+hdrsofar) = ' ';
strncpy(combined_header+hdrsofar+1,decoded_value,newhdr+1);
-   free (decoded_value);
+   g_free (decoded_value);
g_hash_table_insert (message-headers, header, combined_header);
}
} else {
@@ -350,7 +350,7 @@ notmuch_message_file_get_header (notmuch_message_file_t 
*message,
g_hash_table_insert (message-headers, header, decoded_value);
} else {
free (header);
-   free (decoded_value);
+   g_free (decoded_value);
decoded_value = header_sofar;
}
}
-- 
1.8.0

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch