diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-13 22:21:22 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-13 22:21:22 +0000 |
| commit | 9ebac2bff6a3b945a6bdef67a9548fb648387888 (patch) | |
| tree | 5fa314a8f356089956554ab984dc40862013e32e | |
| parent | 62f60df6b4966d4e3d7f478284768115ef150b20 (diff) | |
| download | wireshark-9ebac2bff6a3b945a6bdef67a9548fb648387888.tar.gz | |
g_free() is NULL safe, so we don't need check against it.
svn path=/trunk/; revision=27719
| -rw-r--r-- | asn1/pres/packet-pres-template.c | 3 | ||||
| -rw-r--r-- | asn1/snmp/packet-snmp-template.c | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-pres.c | 9 |
3 files changed, 13 insertions, 11 deletions
diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c index 796036b30a..6e1cc3a5b1 100644 --- a/asn1/pres/packet-pres-template.c +++ b/asn1/pres/packet-pres-template.c @@ -182,6 +182,7 @@ pres_copy_cb(void *dest, const void *orig, unsigned len _U_) pres_user_t *u = dest; const pres_user_t *o = orig; + u->ctx_id = o->ctx_id; u->oid = g_strdup(o->oid); return dest; @@ -192,7 +193,7 @@ pres_free_cb(void *r) { pres_user_t *u = r; - if (u->oid) g_free(u->oid); + g_free(u->oid); } static gboolean diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index e6be09d1f7..9dd53282be 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -1812,12 +1812,12 @@ static void* snmp_users_copy_cb(void* dest, const void* orig, unsigned len _U_) static void snmp_users_free_cb(void* p) { snmp_ue_assoc_t* ue = p; - if (ue->user.userName.data) g_free(ue->user.userName.data); - if (ue->user.authPassword.data) g_free(ue->user.authPassword.data); - if (ue->user.privPassword.data) g_free(ue->user.privPassword.data); - if (ue->user.authKey.data) g_free(ue->user.authKey.data); - if (ue->user.privKey.data) g_free(ue->user.privKey.data); - if (ue->engine.data) g_free(ue->engine.data); + g_free(ue->user.userName.data); + g_free(ue->user.authPassword.data); + g_free(ue->user.privPassword.data); + g_free(ue->user.authKey.data); + g_free(ue->user.privKey.data); + g_free(ue->engine.data); } static void snmp_users_update_cb(void* p _U_, const char** err) { diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index d14f5fdd8f..56b90ce17d 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -312,6 +312,7 @@ pres_copy_cb(void *dest, const void *orig, unsigned len _U_) pres_user_t *u = dest; const pres_user_t *o = orig; + u->ctx_id = o->ctx_id; u->oid = g_strdup(o->oid); return dest; @@ -322,7 +323,7 @@ pres_free_cb(void *r) { pres_user_t *u = r; - if (u->oid) g_free(u->oid); + g_free(u->oid); } static gboolean @@ -1322,7 +1323,7 @@ dissect_pres_RSA_PPDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ /*--- End of included file: packet-pres-fn.c ---*/ -#line 221 "packet-pres-template.c" +#line 222 "packet-pres-template.c" /* @@ -1785,7 +1786,7 @@ void proto_register_pres(void) { "", HFILL }}, /*--- End of included file: packet-pres-hfarr.c ---*/ -#line 375 "packet-pres-template.c" +#line 376 "packet-pres-template.c" }; /* List of subtrees */ @@ -1831,7 +1832,7 @@ void proto_register_pres(void) { &ett_pres_User_session_requirements, /*--- End of included file: packet-pres-ettarr.c ---*/ -#line 381 "packet-pres-template.c" +#line 382 "packet-pres-template.c" }; static uat_field_t users_flds[] = { |