diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-14 11:56:45 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-14 11:56:45 +0000 |
| commit | 5635a1f8bb28a2fdf0c61c48c79f718ff1e7c401 (patch) | |
| tree | 0e03a2dacbdf8c22b365736d78db869364e9dcbf /epan/dissectors/packet-bootp.c | |
| parent | 074349264e4d3e139ed2622645bdef231b63ede3 (diff) | |
Revert to emem for uat
svn path=/trunk/; revision=52032
Diffstat (limited to 'epan/dissectors/packet-bootp.c')
| -rw-r--r-- | epan/dissectors/packet-bootp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 7d1d7d3e45..25b0af0e9c 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -1212,7 +1212,7 @@ static void uat_bootp_record_update_cb(void* r, const char** err) { uat_bootp_record_t* rec = (uat_bootp_record_t *)r; if ((rec->opt == 0) || (rec->opt >=BOOTP_OPT_NUM-1)) - *err = wmem_strdup_printf(wmem_packet_scope(), "Option must be between 1 and %d", BOOTP_OPT_NUM-2); + *err = ep_strdup_printf("Option must be between 1 and %d", BOOTP_OPT_NUM-2); } static void uat_bootp_record_free_cb(void*r) { @@ -5311,7 +5311,7 @@ bootp_init_protocol(void) /* Now apply the custom options */ for (i = 0; i < num_bootp_records_uat; i++) { - bootp_opt[uat_bootp_records[i].opt].text = wmem_strdup(wmem_file_scope(), uat_bootp_records[i].text); + bootp_opt[uat_bootp_records[i].opt].text = se_strdup(uat_bootp_records[i].text); bootp_opt[uat_bootp_records[i].opt].ftype = uat_bootp_records[i].ftype; bootp_opt[uat_bootp_records[i].opt].phf = NULL; } |