aboutsummaryrefslogtreecommitdiffstats
path: root/follow.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-07-07 09:30:56 +0000
committerGuy Harris <guy@alum.mit.edu>2000-07-07 09:30:56 +0000
commit839193f0e7da2a7c6eb79e3fd66f111dd7f75ad6 (patch)
treeee8805906fdc131ba1fd301234ecaeec08552389 /follow.c
parent4e69c6bc87deb47b14112c781f33d07e7acb4ced (diff)
Use "progdlg_t *" rather than "void *" as the handle for a progress
dialog box; that lets us do some type-checking, but we can still typedef it to an incompletely-defined structure to hide the implementation details from the caller. Make "create_progress_dlg()" take, as an argument, the title to put in the "stop the operation" button, and use "Stop" rather than "Cancel" if stopping the operation doesn't undo all the work it's done. Thaw the clist if we break out of a "read the file" operation, as we freeze it before the operation. svn path=/trunk/; revision=2121
Diffstat (limited to 'follow.c')
-rw-r--r--follow.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/follow.c b/follow.c
index 0ca0bca8dc..d4d0220e23 100644
--- a/follow.c
+++ b/follow.c
@@ -1,6 +1,6 @@
/* follow.c
*
- * $Id: follow.c,v 1.21 2000/03/12 04:26:34 guy Exp $
+ * $Id: follow.c,v 1.22 2000/07/07 09:30:56 guy Exp $
*
* Copyright 1998 Mike Hall <mlh@io.com>
*
@@ -60,7 +60,7 @@ static void write_packet_data( tcp_stream_chunk *, const char * );
very good one */
char*
build_follow_filter( packet_info *pi ) {
- char* buf = malloc(1024);
+ char* buf = g_malloc(1024);
if( pi->net_src.type == AT_IPv4 && pi->net_dst.type == AT_IPv4
&& pi->ipproto == 6 ) {
/* TCP over IPv4 */
@@ -71,7 +71,7 @@ build_follow_filter( packet_info *pi ) {
pi->srcport, pi->destport );
}
else {
- free( buf );
+ g_free( buf );
return NULL;
}
memcpy(&ip_address[0], pi->net_src.data, sizeof ip_address[0]);