diff options
Diffstat (limited to 'tfshark.c')
| -rw-r--r-- | tfshark.c | 262 |
1 files changed, 123 insertions, 139 deletions
@@ -77,14 +77,14 @@ capture_file cfile; -static guint32 cum_bytes; +static uint32_t cum_bytes; static frame_data ref_frame; static frame_data prev_dis_frame; static frame_data prev_cap_frame; -static gboolean prefs_loaded = FALSE; +static bool prefs_loaded; -static gboolean perform_two_pass_analysis; +static bool perform_two_pass_analysis; /* * The way the packet decode is to be written. @@ -97,35 +97,35 @@ typedef enum { } output_action_e; static output_action_e output_action; -static gboolean do_dissection; /* TRUE if we have to dissect each packet */ -static gboolean print_packet_info; /* TRUE if we're to print packet information */ -static gint print_summary = -1; /* TRUE if we're to print packet summary information */ -static gboolean print_details; /* TRUE if we're to print packet details information */ -static gboolean print_hex; /* TRUE if we're to print hex/ascci information */ -static gboolean line_buffered; -static gboolean really_quiet = FALSE; +static bool do_dissection; /* true if we have to dissect each packet */ +static bool print_packet_info; /* true if we're to print packet information */ +static int print_summary = -1; /* true if we're to print packet summary information */ +static bool print_details; /* true if we're to print packet details information */ +static bool print_hex; /* true if we're to print hex/ascii information */ +static bool line_buffered; +static bool really_quiet; static print_format_e print_format = PR_FMT_TEXT; static print_stream_t *print_stream; -static output_fields_t* output_fields = NULL; +static output_fields_t* output_fields; /* The line separator used between packets, changeable via the -S option */ static const char *separator = ""; -static gboolean process_file(capture_file *, int, gint64); -static gboolean process_packet_single_pass(capture_file *cf, - epan_dissect_t *edt, gint64 offset, wtap_rec *rec, - const guchar *pd); +static bool process_file(capture_file *, int, int64_t); +static bool process_packet_single_pass(capture_file *cf, + epan_dissect_t *edt, int64_t offset, wtap_rec *rec, + const unsigned char *pd); static void show_print_file_io_error(int err); -static gboolean write_preamble(capture_file *cf); -static gboolean print_packet(capture_file *cf, epan_dissect_t *edt); -static gboolean write_finale(void); +static bool write_preamble(capture_file *cf); +static bool print_packet(capture_file *cf, epan_dissect_t *edt); +static bool write_finale(void); static void tfshark_cmdarg_err(const char *msg_format, va_list ap); static void tfshark_cmdarg_err_cont(const char *msg_format, va_list ap); -static GHashTable *output_only_tables = NULL; +static GHashTable *output_only_tables; #if 0 struct string_elem { @@ -133,15 +133,15 @@ struct string_elem { const char *lstr; /* The long string */ }; -static gint -string_compare(gconstpointer a, gconstpointer b) +static int +string_compare(const void *a, const void *b) { return strcmp(((const struct string_elem *)a)->sstr, ((const struct string_elem *)b)->sstr); } static void -string_elem_print(gpointer data, gpointer not_used _U_) +string_elem_print(void *data, void *not_used _U_) { fprintf(stderr, " %s - %s\n", ((struct string_elem *)data)->sstr, @@ -245,7 +245,7 @@ glossary_option_help(void) static void print_current_user(void) { - gchar *cur_user, *cur_group; + char *cur_user, *cur_group; if (started_with_special_privs()) { cur_user = get_cur_username(); @@ -271,20 +271,20 @@ main(int argc, char *argv[]) {"version", ws_no_argument, NULL, 'v'}, {0, 0, 0, 0 } }; - gboolean arg_error = FALSE; + bool arg_error = false; int err; - volatile gboolean success; + volatile bool success; volatile int exit_status = 0; - gboolean quiet = FALSE; - gchar *volatile cf_name = NULL; - gchar *rfilter = NULL; - gchar *dfilter = NULL; + bool quiet = false; + char *volatile cf_name = NULL; + char *rfilter = NULL; + char *dfilter = NULL; dfilter_t *rfcode = NULL; dfilter_t *dfcode = NULL; df_error_t *df_err; e_prefs *prefs_p; - gchar *output_only = NULL; + char *output_only = NULL; /* * The leading + ensures that getopt_long() does not permute the argv[] @@ -389,9 +389,9 @@ main(int argc, char *argv[]) while ((opt = ws_getopt_long(argc, argv, optstring, long_options, NULL)) != -1) { switch (opt) { case 'C': /* Configuration Profile */ - if (profile_exists (ws_optarg, FALSE)) { + if (profile_exists (ws_optarg, false)) { set_profile_name (ws_optarg); - } else if (profile_exists (ws_optarg, TRUE)) { + } else if (profile_exists (ws_optarg, true)) { char *pf_dir_path, *pf_dir_path2, *pf_filename; /* Copy from global profile */ if (create_persconffile_profile(ws_optarg, &pf_dir_path) == -1) { @@ -402,7 +402,7 @@ main(int argc, char *argv[]) exit_status = WS_EXIT_INVALID_FILE; goto clean_exit; } - if (copy_persconffile_profile(ws_optarg, ws_optarg, TRUE, &pf_filename, + if (copy_persconffile_profile(ws_optarg, ws_optarg, true, &pf_filename, &pf_dir_path, &pf_dir_path2) == -1) { cmdarg_err("Can't copy file \"%s\" in directory\n\"%s\" to\n\"%s\":\n%s.", pf_filename, pf_dir_path2, pf_dir_path, g_strerror(errno)); @@ -423,15 +423,15 @@ main(int argc, char *argv[]) output_only = g_strdup(ws_optarg); /* FALLTHROUGH */ case 'V': /* Verbose */ - print_details = TRUE; - print_packet_info = TRUE; + print_details = true; + print_packet_info = true; break; case 'x': /* Print packet data in hex (and ASCII) */ - print_hex = TRUE; + print_hex = true; /* The user asked for hex output, so let's ensure they get it, * even if they're writing to a file. */ - print_packet_info = TRUE; + print_packet_info = true; break; case 'X': ex_opt_add(ws_optarg); @@ -448,7 +448,7 @@ main(int argc, char *argv[]) * necessarily requiring that either the summary or details be printed too. */ if (print_summary == -1) - print_summary = (print_details || print_hex) ? FALSE : TRUE; + print_summary = (print_details || print_hex) ? false : true; init_report_message("tfshark", &tfshark_report_routines); @@ -468,13 +468,13 @@ main(int argc, char *argv[]) * capture files, but that mechanism should support plugins for * other files, too, if *their* formats are extensible. */ - wtap_init(TRUE); + wtap_init(true); /* Register all dissectors; we must do this before checking for the "-G" flag, as the "-G" flag dumps information registered by the dissectors, and we must do it before we read the preferences, in case any dissectors register preferences. */ - if (!epan_init(NULL, NULL, TRUE)) { + if (!epan_init(NULL, NULL, true)) { exit_status = WS_EXIT_INIT_FAILED; goto clean_exit; } @@ -550,7 +550,7 @@ main(int argc, char *argv[]) /* Load libwireshark settings from the current profile. */ prefs_p = epan_load_settings(); - prefs_loaded = TRUE; + prefs_loaded = true; cap_file_init(&cfile); @@ -573,7 +573,7 @@ main(int argc, char *argv[]) while ((opt = ws_getopt_long(argc, argv, optstring, long_options, NULL)) != -1) { switch (opt) { case '2': /* Perform two-pass analysis */ - perform_two_pass_analysis = TRUE; + perform_two_pass_analysis = true; break; case 'C': /* already processed; just ignore it now */ @@ -622,7 +622,7 @@ main(int argc, char *argv[]) anything to happen, it should be as good as line-buffered mode if we're printing protocol trees - arguably even better, as it may do fewer writes. */ - line_buffered = TRUE; + line_buffered = true; break; case 'o': /* Override preference from command line */ { @@ -656,11 +656,11 @@ main(int argc, char *argv[]) break; } case 'q': /* Quiet */ - quiet = TRUE; + quiet = true; break; case 'Q': /* Really quiet */ - quiet = TRUE; - really_quiet = TRUE; + quiet = true; + really_quiet = true; break; case 'r': /* Read capture file x */ cf_name = g_strdup(ws_optarg); @@ -680,16 +680,16 @@ main(int argc, char *argv[]) print_format = PR_FMT_PS; } else if (strcmp(ws_optarg, "pdml") == 0) { output_action = WRITE_XML; - print_details = TRUE; /* Need details */ - print_summary = FALSE; /* Don't allow summary */ + print_details = true; /* Need details */ + print_summary = false; /* Don't allow summary */ } else if (strcmp(ws_optarg, "psml") == 0) { output_action = WRITE_XML; - print_details = FALSE; /* Don't allow details */ - print_summary = TRUE; /* Need summary */ + print_details = false; /* Don't allow details */ + print_summary = true; /* Need summary */ } else if (strcmp(ws_optarg, "fields") == 0) { output_action = WRITE_FIELDS; - print_details = TRUE; /* Need full tree info */ - print_summary = FALSE; /* Don't allow summary */ + print_details = true; /* Need full tree info */ + print_summary = false; /* Don't allow summary */ } else { cmdarg_err("Invalid -T parameter \"%s\"; it must be one of:", ws_optarg); /* x */ cmdarg_err_cont("\t\"fields\" The values of fields specified with the -e option, in a form\n" @@ -804,7 +804,7 @@ main(int argc, char *argv[]) /* if "-q" wasn't specified, we should print packet information */ if (!quiet) - print_packet_info = TRUE; + print_packet_info = true; if (arg_error) { print_usage(stderr); @@ -831,7 +831,7 @@ main(int argc, char *argv[]) output_only_tables = g_hash_table_new (g_str_hash, g_str_equal); for (ps = strtok (output_only, ","); ps; ps = strtok (NULL, ",")) { - g_hash_table_insert(output_only_tables, (gpointer)ps, (gpointer)ps); + g_hash_table_insert(output_only_tables, (void *)ps, (void *)ps); } } @@ -856,7 +856,7 @@ main(int argc, char *argv[]) } /* Build the column format array */ - build_column_format_array(&cfile.cinfo, prefs_p->num_cols, TRUE); + build_column_format_array(&cfile.cinfo, prefs_p->num_cols, true); if (rfilter != NULL) { if (!dfilter_compile(rfilter, &rfcode, &df_err)) { @@ -915,7 +915,7 @@ main(int argc, char *argv[]) /* TODO: if tfshark is ever changed to give the user a choice of which open_routine reader to use, then the following needs to change. */ - if (cf_open(&cfile, cf_name, WTAP_TYPE_AUTO, FALSE, &err) != CF_OK) { + if (cf_open(&cfile, cf_name, WTAP_TYPE_AUTO, false, &err) != CF_OK) { exit_status = WS_EXIT_OPEN_ERROR; goto clean_exit; } @@ -941,7 +941,7 @@ main(int argc, char *argv[]) "\n" "Some infos / workarounds can be found at:\n" WS_WIKI_URL("KnownBugs/OutOfMemory") "\n"); - success = FALSE; + success = false; } ENDTRY; @@ -958,7 +958,7 @@ main(int argc, char *argv[]) cfile.provider.frames = NULL; } - draw_tap_listeners(TRUE); + draw_tap_listeners(true); funnel_dump_all_text_windows(); clean_exit: @@ -974,25 +974,8 @@ clean_exit: return exit_status; } -static const nstime_t * -tfshark_get_frame_ts(struct packet_provider_data *prov, guint32 frame_num) -{ - const frame_data *fd = NULL; - if (prov->ref && prov->ref->num == frame_num) { - fd = prov->ref; - } else if (prov->prev_dis && prov->prev_dis->num == frame_num) { - fd = prov->prev_dis; - } else if (prov->prev_cap && prov->prev_cap->num == frame_num) { - fd = prov->prev_cap; - } else if (prov->frames) { - fd = frame_data_sequence_find(prov->frames, frame_num); - } - - return (fd && fd->has_ts) ? &fd->abs_ts : NULL; -} - static const char * -no_interface_name(struct packet_provider_data *prov _U_, guint32 interface_id _U_) +no_interface_name(struct packet_provider_data *prov _U_, uint32_t interface_id _U_, unsigned section_number _U_) { return ""; } @@ -1001,7 +984,8 @@ static epan_t * tfshark_epan_new(capture_file *cf) { static const struct packet_provider_funcs funcs = { - tfshark_get_frame_ts, + /* XXX - there should be no need for time stamps */ + cap_file_provider_get_frame_ts, no_interface_name, NULL, NULL, @@ -1010,14 +994,14 @@ tfshark_epan_new(capture_file *cf) return epan_new(&cf->provider, &funcs); } -static gboolean +static bool process_packet_first_pass(capture_file *cf, epan_dissect_t *edt, - gint64 offset, wtap_rec *rec, - const guchar *pd) + int64_t offset, wtap_rec *rec, + const unsigned char *pd) { frame_data fdlocal; - guint32 framenum; - gboolean passed; + uint32_t framenum; + bool passed; /* The frame number of this packet is one more than the count of frames in this packet. */ @@ -1026,7 +1010,7 @@ process_packet_first_pass(capture_file *cf, epan_dissect_t *edt, /* If we're not running a display filter and we're not printing any packet information, we don't need to do a dissection. This means that all packets can be marked as 'passed'. */ - passed = TRUE; + passed = true; frame_data_init(&fdlocal, framenum, rec, offset, cum_bytes); @@ -1084,18 +1068,18 @@ process_packet_first_pass(capture_file *cf, epan_dissect_t *edt, return passed; } -static gboolean +static bool process_packet_second_pass(capture_file *cf, epan_dissect_t *edt, frame_data *fdata, wtap_rec *rec, Buffer *buf) { column_info *cinfo; - gboolean passed; + bool passed; /* If we're not running a display filter and we're not printing any packet information, we don't need to do a dissection. This means that all packets can be marked as 'passed'. */ - passed = TRUE; + passed = true; /* If we're going to print packet information, or we're going to run a read filter, or we're going to process taps, set up to @@ -1155,7 +1139,7 @@ process_packet_second_pass(capture_file *cf, epan_dissect_t *edt, if (ferror(stdout)) { show_print_file_io_error(errno); - return FALSE; + return false; } } cf->provider.prev_dis = fdata; @@ -1168,13 +1152,13 @@ process_packet_second_pass(capture_file *cf, epan_dissect_t *edt, return passed || fdata->dependent_of_displayed; } -static gboolean -local_wtap_read(capture_file *cf, wtap_rec *file_rec _U_, int *err, gchar **err_info _U_, gint64 *data_offset _U_, guint8** data_buffer) +static bool +local_wtap_read(capture_file *cf, wtap_rec *file_rec _U_, int *err, char **err_info _U_, int64_t *data_offset _U_, uint8_t** data_buffer) { /* int bytes_read; */ - gint64 packet_size = wtap_file_size(cf->provider.wth, err); + int64_t packet_size = wtap_file_size(cf->provider.wth, err); - *data_buffer = (guint8*)g_malloc((gsize)packet_size); + *data_buffer = (uint8_t*)g_malloc((size_t)packet_size); /* bytes_read =*/ file_read(*data_buffer, (unsigned int)packet_size, cf->provider.wth->fh); #if 0 /* no more filetap */ @@ -1182,16 +1166,16 @@ local_wtap_read(capture_file *cf, wtap_rec *file_rec _U_, int *err, gchar **err_ *err = file_error(cf->provider.wth->fh, err_info); if (*err == 0) *err = FTAP_ERR_SHORT_READ; - return FALSE; + return false; } else if (bytes_read == 0) { /* Done with file, no error */ - return FALSE; + return false; } /* XXX - SET FRAME SIZE EQUAL TO TOTAL FILE SIZE */ - file_rec->rec_header.packet_header.caplen = (guint32)packet_size; - file_rec->rec_header.packet_header.len = (guint32)packet_size; + file_rec->rec_header.packet_header.caplen = (uint32_t)packet_size; + file_rec->rec_header.packet_header.len = (uint32_t)packet_size; /* * Set the packet encapsulation to the file's encapsulation @@ -1215,7 +1199,7 @@ local_wtap_read(capture_file *cf, wtap_rec *file_rec _U_, int *err, gchar **err_ */ if (*err == 0) *err = file_error(wth->fh, err_info); - return FALSE; /* failure */ + return false; /* failure */ } /* @@ -1234,22 +1218,22 @@ local_wtap_read(capture_file *cf, wtap_rec *file_rec _U_, int *err, gchar **err_ ws_assert(wth->rec.rec_header.packet_header.pkt_encap != WTAP_ENCAP_PER_PACKET); #endif - return TRUE; /* success */ + return true; /* success */ } -static gboolean -process_file(capture_file *cf, int max_packet_count, gint64 max_byte_count) +static bool +process_file(capture_file *cf, int max_packet_count, int64_t max_byte_count) { - guint32 framenum; + uint32_t framenum; int err; - gchar *err_info = NULL; - gint64 data_offset = 0; - gboolean filtering_tap_listeners; - guint tap_flags; + char *err_info = NULL; + int64_t data_offset = 0; + bool filtering_tap_listeners; + unsigned tap_flags; Buffer buf; epan_dissect_t *edt = NULL; wtap_rec file_rec; - guint8* raw_data; + uint8_t* raw_data; if (print_packet_info) { if (!write_preamble(cf)) { @@ -1277,7 +1261,7 @@ process_file(capture_file *cf, int max_packet_count, gint64 max_byte_count) cf->provider.frames = new_frame_data_sequence(); if (do_dissection) { - gboolean create_proto_tree; + bool create_proto_tree; /* * Determine whether we need to create a protocol tree. @@ -1293,7 +1277,7 @@ process_file(capture_file *cf, int max_packet_count, gint64 max_byte_count) /* We're not going to display the protocol tree on this pass, so it's not going to be "visible". */ - edt = epan_dissect_new(cf->epan, create_proto_tree, FALSE); + edt = epan_dissect_new(cf->epan, create_proto_tree, false); } while (local_wtap_read(cf, &file_rec, &err, &err_info, &data_offset, &raw_data)) { if (process_packet_first_pass(cf, edt, data_offset, &file_rec, raw_data)) { @@ -1329,7 +1313,7 @@ process_file(capture_file *cf, int max_packet_count, gint64 max_byte_count) ws_buffer_init(&buf, 1514); if (do_dissection) { - gboolean create_proto_tree; + bool create_proto_tree; /* * Determine whether we need to create a protocol tree. @@ -1364,7 +1348,7 @@ process_file(capture_file *cf, int max_packet_count, gint64 max_byte_count) } #else if (!process_packet_second_pass(cf, edt, fdata, &cf->rec, &buf)) - return FALSE; + return false; #endif } @@ -1379,7 +1363,7 @@ process_file(capture_file *cf, int max_packet_count, gint64 max_byte_count) framenum = 0; if (do_dissection) { - gboolean create_proto_tree; + bool create_proto_tree; /* * Determine whether we need to create a protocol tree. @@ -1420,7 +1404,7 @@ process_file(capture_file *cf, int max_packet_count, gint64 max_byte_count) if (!process_packet_single_pass(cf, edt, data_offset, &file_rec/*wtap_get_rec(cf->provider.wth)*/, raw_data)) - return FALSE; + return false; /* Stop reading if we have the maximum number of packets; * When the -c option has not been used, max_packet_count @@ -1524,13 +1508,13 @@ out: return (err != 0); } -static gboolean -process_packet_single_pass(capture_file *cf, epan_dissect_t *edt, gint64 offset, - wtap_rec *rec, const guchar *pd) +static bool +process_packet_single_pass(capture_file *cf, epan_dissect_t *edt, int64_t offset, + wtap_rec *rec, const unsigned char *pd) { frame_data fdata; column_info *cinfo; - gboolean passed; + bool passed; /* Count this packet. */ cf->count++; @@ -1538,7 +1522,7 @@ process_packet_single_pass(capture_file *cf, epan_dissect_t *edt, gint64 offset, /* If we're not running a display filter and we're not printing any packet information, we don't need to do a dissection. This means that all packets can be marked as 'passed'. */ - passed = TRUE; + passed = true; frame_data_init(&fdata, cf->count, rec, offset, cum_bytes); @@ -1598,7 +1582,7 @@ process_packet_single_pass(capture_file *cf, epan_dissect_t *edt, gint64 offset, if (ferror(stdout)) { show_print_file_io_error(errno); - return FALSE; + return false; } } @@ -1617,7 +1601,7 @@ process_packet_single_pass(capture_file *cf, epan_dissect_t *edt, gint64 offset, return passed; } -static gboolean +static bool write_preamble(capture_file *cf) { switch (output_action) { @@ -1638,7 +1622,7 @@ write_preamble(capture_file *cf) default: ws_assert_not_reached(); - return FALSE; + return false; } } @@ -1694,7 +1678,7 @@ put_string_spaces(char *dest, const char *str, size_t str_len, size_t str_with_s dest[str_with_spaces] = '\0'; } -static gboolean +static bool print_columns(capture_file *cf) { char *line_bufp; @@ -1712,7 +1696,7 @@ print_columns(capture_file *cf) /* Skip columns not marked as visible. */ if (!get_column_visible(i)) continue; - const gchar* col_text = get_column_text(&cf->cinfo, i); + const char* col_text = get_column_text(&cf->cinfo, i); switch (col_item->col_fmt) { case COL_NUMBER: column_len = col_len = strlen(col_text); @@ -1918,12 +1902,12 @@ print_columns(capture_file *cf) return print_line(print_stream, 0, line_bufp); } -static gboolean +static bool print_packet(capture_file *cf, epan_dissect_t *edt) { if (print_summary || output_fields_has_cols(output_fields)) { /* Just fill in the columns. */ - epan_dissect_fill_in_columns(edt, FALSE, TRUE); + epan_dissect_fill_in_columns(edt, false, true); if (print_summary) { /* Now print them. */ @@ -1931,11 +1915,11 @@ print_packet(capture_file *cf, epan_dissect_t *edt) case WRITE_TEXT: if (!print_columns(cf)) - return FALSE; + return false; break; case WRITE_XML: - write_psml_columns(edt, stdout, FALSE); + write_psml_columns(edt, stdout, false); return !ferror(stdout); case WRITE_FIELDS: /*No non-verbose "fields" format */ ws_assert_not_reached(); @@ -1950,15 +1934,15 @@ print_packet(capture_file *cf, epan_dissect_t *edt) case WRITE_TEXT: if (!proto_tree_print(print_details ? print_dissections_expanded : print_dissections_none, print_hex, edt, output_only_tables, print_stream)) - return FALSE; + return false; if (!print_hex) { if (!print_line(print_stream, 0, separator)) - return FALSE; + return false; } break; case WRITE_XML: - write_pdml_proto_tree(NULL, edt, &cf->cinfo, stdout, FALSE); + write_pdml_proto_tree(NULL, edt, &cf->cinfo, stdout, false); printf("\n"); return !ferror(stdout); case WRITE_FIELDS: @@ -1970,17 +1954,17 @@ print_packet(capture_file *cf, epan_dissect_t *edt) if (print_hex) { if (print_summary || print_details) { if (!print_line(print_stream, 0, "")) - return FALSE; + return false; } if (!print_hex_data(print_stream, edt, HEXDUMP_SOURCE_MULTI | HEXDUMP_ASCII_INCLUDE)) - return FALSE; + return false; if (!print_line(print_stream, 0, separator)) - return FALSE; + return false; } - return TRUE; + return true; } -static gboolean +static bool write_finale(void) { switch (output_action) { @@ -2001,12 +1985,12 @@ write_finale(void) default: ws_assert_not_reached(); - return FALSE; + return false; } } cf_status_t -cf_open(capture_file *cf, const char *fname, unsigned int type, gboolean is_tempfile, int *err _U_) +cf_open(capture_file *cf, const char *fname, unsigned int type, bool is_tempfile, int *err _U_) { /* The open isn't implemented yet. Fill in the information for this file. */ @@ -2026,12 +2010,12 @@ cf_open(capture_file *cf, const char *fname, unsigned int type, gboolean is_temp cf->is_tempfile = is_tempfile; /* No user changes yet. */ - cf->unsaved_changes = FALSE; + cf->unsaved_changes = false; cf->cd_t = 0; /**** XXX - DOESN'T WORK RIGHT NOW!!!! */ cf->open_type = type; cf->count = 0; - cf->drops_known = FALSE; + cf->drops_known = false; cf->drops = 0; cf->snap = 0; /**** XXX - DOESN'T WORK RIGHT NOW!!!! */ nstime_set_zero(&cf->elapsed_time); @@ -2045,10 +2029,10 @@ cf_open(capture_file *cf, const char *fname, unsigned int type, gboolean is_temp /* fail: */ /* - gchar *err_info; + char *err_info; char err_msg[2048+1]; snprintf(err_msg, sizeof err_msg, - cf_open_error_message(*err, err_info, FALSE, cf->cd_t), fname); + cf_open_error_message(*err, err_info, false, cf->cd_t), fname); cmdarg_err("%s", err_msg); return CF_ERROR; */ |