Re-apply r40728 and fix Coverity CID 1371 UNINIT again.

[obnox/wireshark/wip.git] / color_filters.h

diff --git a/color_filters.h b/color_filters.h
index 6ee0b11c91add2b00e123f24d59bc060f4ab2a03..5d5c1ad1cff213523f913389ffc76a340e940368 100644 (file)
--- a/color_filters.h
+++ b/color_filters.h
@@ -24,7 +24,11 @@
 #ifndef  __COLOR_FILTERS_H__
 #define  __COLOR_FILTERS_H__
 
-#define TEMP_COLOR_PREFIX       "___tmp_color_filter___"
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#define CONVERSATION_COLOR_PREFIX       "___conversation_color_filter___"
 /** @file
  *  Color filters.
  */
@@ -104,11 +108,7 @@ void color_filters_prime_edt(epan_dissect_t *edt);
  * @return the matching color filter or NULL
  */
 const color_filter_t *
-#ifdef NEW_PACKET_LIST
 color_filters_colorize_packet(epan_dissect_t *edt);
-#else
-color_filters_colorize_packet(gint row, epan_dissect_t *edt);
-#endif
 
 /** Clone the currently active filter list.
  *
@@ -172,6 +172,7 @@ gboolean color_filters_export(gchar *path, GSList *cfl, gboolean only_selected);
  * @param filter_string the filter string
  * @param bg_color background color
  * @param fg_color foreground color
+ * @param disabled gboolean
  * @return the new color filter
  */
 color_filter_t *color_filter_new(
@@ -193,6 +194,8 @@ void color_filter_delete(color_filter_t *colorf);
  */
 void color_filter_list_delete(GSList **cfl);
 
-
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif