Changeset ae8196e
- Timestamp:
- 09/29/05 17:13:10 (16 years ago)
- 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
- Location:
- lib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_erf.c
rb69afb1 rae8196e 321 321 #endif 322 322 } 323 323 free(filemode); 324 324 return 1; 325 325 } … … 330 330 int level = OPTIONS.erf.level; 331 331 optind = 1; 332 332 333 333 334 while ((opt = getopt(argc, argv, "z:")) != EOF) { … … 370 371 fclose(INPUT.file); 371 372 #endif 373 free(libtrace->format_data); 372 374 } 373 375 … … 382 384 fclose(OUTPUT.file); 383 385 #endif 386 free(libtrace->format_data); 384 387 } 385 388 -
lib/libtrace_int.h
r8283f05 rae8196e 75 75 static struct { 76 76 int err_num; // error code 77 char *problem; // the format, uri etc that caused the error for reporting purposes77 char problem[255]; // the format, uri etc that caused the error for reporting purposes 78 78 } trace_err; 79 79 -
lib/trace.c
rb69afb1 rae8196e 266 266 if (libtrace->format == 0) { 267 267 trace_err.err_num = E_BAD_FORMAT; 268 trace_err.problem = scan; 268 strcpy(trace_err.problem, scan); 269 //trace_err.problem = scan; 269 270 return 0; 270 271 } … … 278 279 if (!libtrace->format->init_input( libtrace)) { 279 280 trace_err.err_num = E_INIT_FAILED; 280 trace_err.problem = scan; 281 strcpy(trace_err.problem, scan); 282 //trace_err.problem = scan; 281 283 return 0; 282 284 } 283 285 } else { 284 286 trace_err.err_num = E_NO_INIT; 285 trace_err.problem = scan; 287 strcpy(trace_err.problem, scan); 288 //trace_err.problem = scan; 286 289 return 0; 287 290 } … … 290 293 libtrace->fifo = create_tracefifo(1048576); 291 294 assert( libtrace->fifo); 292 295 free(scan); 293 296 return libtrace; 294 297 } … … 329 332 if (libtrace->format == 0) { 330 333 trace_err.err_num = E_BAD_FORMAT; 331 trace_err.problem = scan; 334 strcpy(trace_err.problem, scan); 335 //trace_err.problem = scan; 332 336 return 0; 333 337 } 334 338 339 free(scan); 335 340 return libtrace; 336 341 … … 380 385 if (libtrace->format == 0) { 381 386 trace_err.err_num = E_BAD_FORMAT; 382 trace_err.problem = scan; 387 strcpy(trace_err.problem, scan); 388 //trace_err.problem = scan; 383 389 return 0; 384 390 } … … 395 401 } else { 396 402 trace_err.err_num = E_NO_INIT_OUT; 397 trace_err.problem = scan; 403 strcpy(trace_err.problem, scan); 404 //trace_err.problem = scan; 398 405 return 0; 399 406 } … … 402 409 libtrace->fifo = create_tracefifo(1048576); 403 410 assert( libtrace->fifo); 404 411 free(scan); 405 412 return libtrace; 406 413 } … … 424 431 return 0; 425 432 } 426 427 433 asprintf(&opt_string, "%s %s", libtrace->format->name, options); 428 434 parse_cmd(opt_string, &opt_argc, opt_argv, MAXOPTS); … … 1344 1350 // push uridata past the delimiter 1345 1351 uridata++; 1352 1346 1353 return uridata; 1347 1354 }
Note: See TracChangeset
for help on using the changeset viewer.