diff options
author | Ulf Lamping <ulf.lamping@web.de> | 2005-08-08 18:50:39 +0000 |
---|---|---|
committer | Ulf Lamping <ulf.lamping@web.de> | 2005-08-08 18:50:39 +0000 |
commit | 0dc9fb3d4ab00d14bf45c597471e10e601efd4d4 (patch) | |
tree | ae44175ca8fd23548fcec5833098b535af5e372c /tap-iousers.c | |
parent | f3407856f4fd97caf90655205cdb2c66991e75ba (diff) |
various code cleanup:
-use g_snprintf instead of sprintf and snprintf
-use g_strdup_printf where appropriate
-remove #include "snprintf.h" (as only g_snprintf should be used)
-replace some more alloc/realloc/calloc/free with their glib pendants
svn path=/trunk/; revision=15264
Diffstat (limited to 'tap-iousers.c')
-rw-r--r-- | tap-iousers.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/tap-iousers.c b/tap-iousers.c index 693dbe36f7..8ae39be983 100644 --- a/tap-iousers.c +++ b/tap-iousers.c @@ -79,20 +79,20 @@ iousers_udpip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con if(udph->uh_sport>udph->uh_dport){ direction=0; - snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport)); - snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport)); + g_snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport)); + g_snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport)); } else if(udph->uh_sport<udph->uh_dport){ direction=1; - snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport)); - snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport)); + g_snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport)); + g_snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport)); } else if(CMP_ADDRESS(&udph->ip_src, &udph->ip_dst)>0){ direction=0; - snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport)); - snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport)); + g_snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport)); + g_snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport)); } else { direction=1; - snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport)); - snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport)); + g_snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport)); + g_snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport)); } for(iui=iu->items;iui;iui=iui->next){ @@ -137,21 +137,21 @@ iousers_sctp_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, cons io_users_item_t *iui; int direction=0; - sprintf(s_sport,"%d",sctph->sport); - sprintf(s_dport,"%d",sctph->dport); + g_snprintf(s_sport, sizeof s_sport, "%d",sctph->sport); + g_snprintf(s_dport, sizeof s_dport, "%d",sctph->dport); if(sctph->sport > sctph->dport) { direction=0; - snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport); - snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport); + g_snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport); + g_snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport); } else if(sctph->sport < sctph->dport) { direction=1; - snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport); - snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport); + g_snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport); + g_snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport); } else { direction=0; - snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport); - snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport); + g_snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport); + g_snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport); } for(iui=iu->items;iui;iui=iui->next){ @@ -198,20 +198,20 @@ iousers_tcpip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con if(tcph->th_sport>tcph->th_dport){ direction=0; - snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport)); - snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport)); + g_snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport)); + g_snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport)); } else if(tcph->th_sport<tcph->th_dport){ direction=1; - snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport)); - snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport)); + g_snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport)); + g_snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport)); } else if(CMP_ADDRESS(&tcph->ip_src, &tcph->ip_dst)>0){ direction=0; - snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport)); - snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport)); + g_snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport)); + g_snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport)); } else { direction=1; - snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport)); - snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport)); + g_snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport)); + g_snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport)); } for(iui=iu->items;iui;iui=iui->next){ |