diff options
| author | Evan Huus <eapache@gmail.com> | 2013-12-19 15:49:09 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-12-19 15:49:09 +0000 |
| commit | a6415ece0ad102d30ac5dce59b127bcf1bd6d3f1 (patch) | |
| tree | 0eff98882fe8c8a9db6f064b87330b8060fe37b2 /epan/oids.c | |
| parent | b7ab4db2108fda5a1370b807d1b03ad93b1ca8f8 (diff) | |
Rename a couple of to_str functions to have ep_ in the name. This makes it
obvious that the returned string is ephemeral, and opens up the original names
in the API for versions that take a wmem pool (and thus can work in any scope).
svn path=/trunk/; revision=54249
Diffstat (limited to 'epan/oids.c')
| -rw-r--r-- | epan/oids.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/oids.c b/epan/oids.c index b5c9b63d32..d7c6539a63 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -198,7 +198,7 @@ extern void oid_add_from_encoded(const char* name, const guint8 *oid, gint oid_l D(3,("\tOid (from encoded): %s %s ",name, oid_subid2string(subids,subids_len))); add_oid(name,OID_KIND_UNKNOWN,NULL,NULL,subids_len,subids); } else { - D(1,("Failed to add Oid: %s [%d]%s ",name?name:"NULL", oid_len,bytestring_to_str(oid, oid_len, ':'))); + D(1,("Failed to add Oid: %s [%d]%s ",name?name:"NULL", oid_len,bytestring_to_ep_str(oid, oid_len, ':'))); } } @@ -1264,10 +1264,10 @@ char* oid_test_a2b(guint32 num_subids, guint32* subids) { "oid_string2encoded=[%d]%s \n" "oid_string2subid=%s \n " ,sub2str - ,sub2enc_len,bytestring_to_str(sub2enc, sub2enc_len, ':') + ,sub2enc_len,bytestring_to_ep_str(sub2enc, sub2enc_len, ':') ,enc2sub ? oid_subid2string(enc2sub,enc2sub_len) : "-" ,enc2str - ,str2enc_len,bytestring_to_str(str2enc, str2enc_len, ':') + ,str2enc_len,bytestring_to_ep_str(str2enc, str2enc_len, ':') ,str2sub ? oid_subid2string(str2sub,str2sub_len) : "-" ); } |