Changeset ae8196e

Timestamp:

09/29/05 17:13:10 (16 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

18478c1

Parents:

8283f05

Message:

A few changes that fix tiny memory leaks

Location:

lib

Files:

• format_erf.c (modified) (4 diffs)
• libtrace_int.h (modified) (1 diff)
• trace.c (modified) (9 diffs)

lib/format_erf.c

@@ -321 +321 @@
 #endif
         }
-        
+        free(filemode); 
         return 1;
 }
@@ -330 +330 @@
         int level = OPTIONS.erf.level;
         optind = 1;
+
 
         while ((opt = getopt(argc, argv, "z:")) != EOF) {
@@ -370 +371 @@
         fclose(INPUT.file);     
 #endif
+        free(libtrace->format_data);
 }
 
@@ -382 +384 @@
         fclose(OUTPUT.file);
 #endif
+        free(libtrace->format_data);
 }
  

lib/libtrace_int.h

@@ -75 +75 @@
 static struct {
         int err_num;    // error code
-        char *problem;  // the format, uri etc that caused the error for reporting purposes
+        char problem[255];      // the format, uri etc that caused the error for reporting purposes
 } trace_err;
 

lib/trace.c

@@ -266 +266 @@
         if (libtrace->format == 0) {
                 trace_err.err_num = E_BAD_FORMAT;
-                trace_err.problem = scan;
+                strcpy(trace_err.problem, scan);
+                //trace_err.problem = scan;
                 return 0;
         }
@@ -278 +279 @@
                 if (!libtrace->format->init_input( libtrace)) {
                         trace_err.err_num = E_INIT_FAILED;
-                        trace_err.problem = scan;
+                        strcpy(trace_err.problem, scan);
+                        //trace_err.problem = scan;
                         return 0;
                 }
         } else {
                 trace_err.err_num = E_NO_INIT;
-                trace_err.problem = scan;
+                strcpy(trace_err.problem, scan);
+                //trace_err.problem = scan;
                 return 0;
         }
@@ -290 +293 @@
         libtrace->fifo = create_tracefifo(1048576);
         assert( libtrace->fifo);
-
+        free(scan);
         return libtrace;
 }
@@ -329 +332 @@
         if (libtrace->format == 0) {
                 trace_err.err_num = E_BAD_FORMAT;
-                trace_err.problem = scan;
+                strcpy(trace_err.problem, scan);
+                //trace_err.problem = scan;
                 return 0;
         }
-
+        
+        free(scan);
         return libtrace;
 
@@ -380 +385 @@
         if (libtrace->format == 0) {
                 trace_err.err_num = E_BAD_FORMAT;
-                trace_err.problem = scan;       
+                strcpy(trace_err.problem, scan);
+                //trace_err.problem = scan;     
                 return 0;
         }
@@ -395 +401 @@
         } else {
                 trace_err.err_num = E_NO_INIT_OUT;
-                trace_err.problem = scan;
+                strcpy(trace_err.problem, scan);
+                //trace_err.problem = scan;
                 return 0;
         }
@@ -402 +409 @@
         libtrace->fifo = create_tracefifo(1048576);
         assert( libtrace->fifo);
-
+        free(scan);
         return libtrace;
 }
@@ -424 +431 @@
                 return 0;
         }
-        
         asprintf(&opt_string, "%s %s", libtrace->format->name, options);
         parse_cmd(opt_string, &opt_argc, opt_argv, MAXOPTS);
@@ -1344 +1350 @@
         // push uridata past the delimiter
         uridata++;
+        
         return uridata;
 }