Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 17 insertions, 18 deletions

diff --git a/epan/dissectors/packet-epl.h b/epan/dissectors/packet-epl.h
index fd145acf..39c7cd15 100644
--- a/epan/dissectors/packet-epl.h
+++ b/epan/dissectors/packet-epl.h
@@ -13,7 +13,6 @@
 #ifndef __EPL_H_
 #define __EPL_H_
 
-#include <glib.h>
 #include <epan/address.h>
 #include <epan/wmem_scopes.h>
 #include <epan/range.h>
@@ -21,12 +20,12 @@
 struct epl_datatype;
 
 struct profile {
-	guint16 id;
-	guint8 nodeid;
+	uint16_t id;
+	uint8_t nodeid;
 	address node_addr;
 
-	guint32 vendor_id;
-	guint32 product_code;
+	uint32_t vendor_id;
+	uint32_t product_code;
 
 	wmem_map_t *objects;
 	wmem_allocator_t *scope, *parent_scope;
@@ -35,7 +34,7 @@ struct profile {
 	char *name;
 	char *path;
 	void *data;
-	guint cb_id;
+	unsigned cb_id;
 	wmem_array_t *TPDO; /* CN->MN */
 	wmem_array_t *RPDO; /* MN->CN */
 
@@ -44,20 +43,20 @@ struct profile {
 
 enum { OD_ENTRY_SCALAR = 7, OD_ENTRY_ARRAY = 8, OD_ENTRY_RECORD = 9 };
 struct od_entry {
-	guint16 idx;
+	uint16_t idx;
 	/* This is called the ObjectType in the standard,
 	 * but this is too easy to be mistaken with the
 	 * DataType.
 	 * ObjectType specifies whether it's a scalar or
 	 * an aggregate
 	 */
-	guint16 type_class;
+	uint16_t type_class;
 	char name[64];
 	/* Called DataType by the standard,
 	 * Can be e.g. Unsigned32
 	 */
 	const struct epl_datatype *type;
-	guint64 value;
+	uint64_t value;
 };
 #define OD_ENTRY_INITIALIZER { 0, 0, { 0 }, 0, 0 }
 
@@ -79,7 +78,7 @@ struct profile;
 const struct epl_datatype *epl_type_to_hf(const char *name);
 
 static inline gboolean
-subobject_equal(gconstpointer _a, gconstpointer _b)
+subobject_equal(const void *_a, const void *_b)
 {
 	const struct od_entry *a = &((const struct subobject*)_a)->info;
 	const struct od_entry *b = &((const struct subobject*)_b)->info;
@@ -95,17 +94,17 @@ void epl_eds_init(void);
 struct profile *epl_eds_load(struct profile *profile, const char *eds_file);
 
 
-struct object *epl_profile_object_add(struct profile *profile, guint16 idx);
-struct object *epl_profile_object_lookup_or_add(struct profile *profile, guint16 idx);
+struct object *epl_profile_object_add(struct profile *profile, uint16_t idx);
+struct object *epl_profile_object_lookup_or_add(struct profile *profile, uint16_t idx);
 
-gboolean epl_profile_object_mapping_add(struct profile *profile, guint16 idx, guint8 subindex, guint64 mapping);
-gboolean epl_profile_object_mappings_update(struct profile *profile);
+bool epl_profile_object_mapping_add(struct profile *profile, uint16_t idx, uint8_t subindex, uint64_t mapping);
+bool epl_profile_object_mappings_update(struct profile *profile);
 
-range_admin_t * epl_wmem_iarray_find(epl_wmem_iarray_t *arr, guint32 value);
-gboolean epl_wmem_iarray_is_empty(epl_wmem_iarray_t *iarr);
-gboolean epl_wmem_iarray_is_sorted(epl_wmem_iarray_t *iarr);
+range_admin_t * epl_wmem_iarray_find(epl_wmem_iarray_t *arr, uint32_t value);
+bool epl_wmem_iarray_is_empty(epl_wmem_iarray_t *iarr);
+bool epl_wmem_iarray_is_sorted(epl_wmem_iarray_t *iarr);
 
-#define EPL_OBJECT_MAPPING_SIZE ((guint)sizeof (guint64))
+#define EPL_OBJECT_MAPPING_SIZE ((unsigned)sizeof (uint64_t))
 
 #define CHECK_OVERLAP_ENDS(x1, x2, y1, y2) ((x1) < (y2) && (y1) < (x2))
 #define CHECK_OVERLAP_LENGTH(x, x_len, y, y_len) \