Completely remove support for proto_item_set_expert_flags.

svn path=/trunk/; revision=51144

4 files changed, 11 insertions, 57 deletions

diff --git a/epan/expert.c b/epan/expert.c
index f4399e7939..c46260247a 100644
--- a/epan/expert.c
+++ b/epan/expert.c
@@ -229,17 +229,25 @@ expert_register_field_array(expert_module_t* module, ei_register_info *exp, cons
 	}
 }
 
+/** clear flags according to the mask and set new flag values */
+#define FI_REPLACE_FLAGS(fi, mask, flags_in) { \
+	(fi->flags = (fi)->flags & ~(mask)); \
+	(fi->flags = (fi)->flags | (flags_in)); \
+}
 
 /* set's the PI_ flags to a protocol item
  * (and its parent items till the toplevel) */
 static void
-expert_set_item_flags(proto_item *pi, int group, int severity)
+expert_set_item_flags(proto_item *pi, const int group, const guint severity)
 {
-	if (proto_item_set_expert_flags(pi, group, severity)) {
+	if (pi != NULL && PITEM_FINFO(pi) != NULL && (severity >= FI_GET_FLAG(PITEM_FINFO(pi), PI_SEVERITY_MASK))) {
+		FI_REPLACE_FLAGS(PITEM_FINFO(pi), PI_GROUP_MASK, group);
+		FI_REPLACE_FLAGS(PITEM_FINFO(pi), PI_SEVERITY_MASK, severity);
+
 		/* propagate till toplevel item */
 		pi = proto_item_get_parent(pi);
 		expert_set_item_flags(pi, group, severity);
-	}
+    }
 }
 
 static proto_tree*
diff --git a/epan/proto.c b/epan/proto.c
index 13c8293e61..b221a24f93 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -4096,30 +4096,6 @@ proto_item_get_len(const proto_item *pi)
 	return fi ? fi->length : -1;
 }
 
-
-/** clear flags according to the mask and set new flag values */
-#define FI_REPLACE_FLAGS(fi, mask, flags_in) { \
-	(fi->flags = (fi)->flags & ~(mask)); \
-	(fi->flags = (fi)->flags | (flags_in)); \
-}
-
-gboolean
-proto_item_set_expert_flags(proto_item *pi, const int group, const guint severity)
-{
-	if (pi == NULL || PITEM_FINFO(pi) == NULL)
-		return FALSE;
-
-	/* only change things if severity is worse or at least equal than before */
-	if (severity >= FI_GET_FLAG(PITEM_FINFO(pi), PI_SEVERITY_MASK)) {
-		FI_REPLACE_FLAGS(PITEM_FINFO(pi), PI_GROUP_MASK, group);
-		FI_REPLACE_FLAGS(PITEM_FINFO(pi), PI_SEVERITY_MASK, severity);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
 proto_tree *
 proto_tree_create_root(packet_info *pinfo)
 {
diff --git a/epan/proto.h b/epan/proto.h
index cc7a574ec0..378dd38ea2 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -696,16 +696,6 @@ WS_DLL_PUBLIC void proto_item_set_end(proto_item *ti, tvbuff_t *tvb, gint end);
  @return the current length */
 WS_DLL_PUBLIC int proto_item_get_len(const proto_item *ti);
 
-/**
- * Sets an expert info to the proto_item.
- @param ti the item to set the expert info
- @param group the group of this info (e.g. PI_CHECKSUM)
- @param severity of this info (e.g. PI_ERROR)
- @return TRUE if value was written
- */
-WS_DLL_PUBLIC gboolean proto_item_set_expert_flags(proto_item *ti, const int group, const guint severity);
-
-
 
 
 /** Creates a new proto_tree root.
diff --git a/epan/wslua/wslua_tree.c b/epan/wslua/wslua_tree.c
index 870c955147..4452abee8c 100644
--- a/epan/wslua/wslua_tree.c
+++ b/epan/wslua/wslua_tree.c
@@ -321,25 +321,6 @@ WSLUA_METHOD TreeItem_append_text(lua_State *L) {
     return 0;
 }
 
-WSLUA_METHOD TreeItem_set_expert_flags(lua_State *L) {
-    /* Sets the expert flags of the item. */
-#define WSLUA_OPTARG_TreeItem_set_expert_flags_GROUP 2 /* One of PI_CHECKSUM, PI_SEQUENCE, PI_RESPONSE_CODE, PI_REQUEST_CODE, PI_UNDECODED, PI_REASSEMBLE, PI_MALFORMED or PI_DEBUG */
-#define WSLUA_OPTARG_TreeItem_set_expert_flags_SEVERITY 3 /* One of PI_CHAT, PI_NOTE, PI_WARN, PI_ERROR */
-    TreeItem ti = checkTreeItem(L,1);
-    int group = luaL_optint(L,WSLUA_OPTARG_TreeItem_set_expert_flags_GROUP,PI_DEBUG);
-    int severity = luaL_optint(L,WSLUA_OPTARG_TreeItem_set_expert_flags_SEVERITY,PI_CHAT);
-
-    if ( ti && ti->item ) {
-        if (ti->expired) {
-            luaL_error(L,"expired TreeItem");
-            return 0;
-        }
-        proto_item_set_expert_flags(ti->item,group,severity);
-    }
-
-    return 0;
-}
-
 WSLUA_METHOD TreeItem_add_expert_info(lua_State *L) {
     /* Sets the expert flags of the item and adds expert info to the packet. */
 #define WSLUA_OPTARG_TreeItem_add_expert_info_GROUP 2 /* One of PI_CHECKSUM, PI_SEQUENCE, PI_RESPONSE_CODE, PI_REQUEST_CODE, PI_UNDECODED, PI_REASSEMBLE, PI_MALFORMED or PI_DEBUG */
@@ -424,7 +405,6 @@ static const luaL_Reg TreeItem_methods[] = {
     {"add_le",           TreeItem_add_le},
     {"set_text",         TreeItem_set_text},
     {"append_text",      TreeItem_append_text},
-    {"set_expert_flags", TreeItem_set_expert_flags},
     {"add_expert_info",  TreeItem_add_expert_info},
     {"set_generated",    TreeItem_set_generated},
     {"set_hidden",       TreeItem_set_hidden},