diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-08-01 20:59:38 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-08-01 20:59:38 +0000 |
| commit | 08eb36b5af5da365087ea19194a0a00bd1310ce2 (patch) | |
| tree | bc8a0b2ba1a0816c79a164025e72873a4cbab715 /epan/frame_data.c | |
| parent | 6c5e16185dfd4c9e955618f56ac8827ad7eda9e7 (diff) | |
Remove fdata->opt_comment, add pkt_comment to pinfo
Original (read from file) comments can be accessed by pkthdr->opt_comment
Keep user comments in seperated BST, add new method for epan session to get it.
svn path=/trunk/; revision=51090
Diffstat (limited to 'epan/frame_data.c')
| -rw-r--r-- | epan/frame_data.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/epan/frame_data.c b/epan/frame_data.c index a7d66c73bf..0b2d8b83bb 100644 --- a/epan/frame_data.c +++ b/epan/frame_data.c @@ -279,6 +279,7 @@ frame_data_init(frame_data *fdata, guint32 num, fdata->flags.ref_time = 0; fdata->flags.ignored = 0; fdata->flags.has_ts = (phdr->presence_flags & WTAP_HAS_TS) ? 1 : 0; + fdata->flags.has_phdr_comment = (phdr->opt_comment != NULL); fdata->color_filter = NULL; fdata->abs_ts.secs = phdr->ts.secs; fdata->abs_ts.nsecs = phdr->ts.nsecs; @@ -286,7 +287,6 @@ frame_data_init(frame_data *fdata, guint32 num, fdata->shift_offset.nsecs = 0; fdata->frame_ref_num = 0; fdata->prev_dis_num = 0; - fdata->opt_comment = phdr->opt_comment; } void @@ -357,11 +357,6 @@ frame_data_destroy(frame_data *fdata) g_slist_free(fdata->pfd); fdata->pfd = NULL; } - - if (fdata->opt_comment) { - g_free(fdata->opt_comment); - fdata->opt_comment = NULL; - } } /* |