remove wrong! string terminator detection

[metze/wireshark/wip.git] / file.h

diff --git a/file.h b/file.h
index c40854b7e340cdf4515e3fa11900cdf5549230ba..82640780debd373bf79eb00da8c2611d4a105483 100644 (file)
--- a/file.h
+++ b/file.h
@@ -156,7 +156,7 @@ gboolean cf_can_save_as(capture_file *cf);
  * @param fname the filename to save to
  * @param range the range of packets to save
  * @param save_format the format of the file to save (libpcap, ...)
- * @param compressed wether to gzip compress the file
+ * @param compressed whether to gzip compress the file
  * @return one of cf_status_t
  */
 cf_status_t cf_save(capture_file * cf, const char *fname, packet_range_t *range, guint save_format, gboolean compressed);
@@ -274,10 +274,9 @@ void cf_redissect_packets(capture_file *cf);
  * Rescan all packets and just run taps - don't reconstruct the display.
  * 
  * @param cf the capture file
- * @param do_columns TRUE if columns are to be generated, FALSE otherwise
  * @return one of cf_read_status_t
  */
-cf_read_status_t cf_retap_packets(capture_file *cf, gboolean do_columns);
+cf_read_status_t cf_retap_packets(capture_file *cf);
 
 /**
  * The time format has changed, rescan all packets.
@@ -470,4 +469,8 @@ cf_status_t
 cf_merge_files(char **out_filename, int in_file_count,
                char *const *in_filenames, int file_type, gboolean do_append);
 
+#if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS)
+void read_keytab_file(const char *);
+#endif
+
 #endif /* file.h */