diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2008-04-07 05:22:54 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2008-04-07 05:22:54 +0000 |
| commit | 726a1caaf1c717a5784beb2fb5a05900552563f0 (patch) | |
| tree | 3f861f04f60e8872bcf7f82f56de654af93a7590 /epan/dissectors/packet-multipart.c | |
| parent | 545d54ae745aa147ffa2e883dd0b982b56f86761 (diff) | |
| download | wireshark-726a1caaf1c717a5784beb2fb5a05900552563f0.tar.gz | |
- Remove GLIB1 code
- Change ugly GLIB version checking statements to GLIB_CHECK_VERSION
- Remove ws_strsplit files because we no longer need to borrow GLIB2's
g_strsplit code for the no longer supported GLIB1 builds
svn path=/trunk/; revision=24829
Diffstat (limited to 'epan/dissectors/packet-multipart.c')
| -rw-r--r-- | epan/dissectors/packet-multipart.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index bbfcccd55f..2d164f6099 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -682,12 +682,9 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary, } else { parameters = NULL; } -#if GLIB_MAJOR_VERSION < 2 - content_type_str = g_strdup(value_str); - g_strdown(content_type_str); -#else + content_type_str = g_ascii_strdown(value_str, -1); -#endif + /* Show content-type in root 'part' label */ proto_item_append_text(ti, " (%s)", content_type_str); @@ -707,12 +704,8 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary, if (cr_offset > 0) { value_str[cr_offset] = '\0'; } -#if GLIB_MAJOR_VERSION < 2 - content_encoding_str = g_strdup(value_str); - g_strdown(content_encoding_str); -#else + content_encoding_str = g_ascii_strdown(value_str, -1); -#endif } break; case POS_CONTENT_DISPOSITION: |