ofp-print: Avoid converting flow to ofp_match just to format it.

[openvswitch] / lib / util.h

diff --git a/lib/util.h b/lib/util.h
index 9eca8ec9adb09b029729a40f922ce5748c1854a7..703b93cf4c6e528ec0d5c48ae5034b03f0cd710f 100644 (file)
--- a/lib/util.h
+++ b/lib/util.h
@@ -82,6 +82,16 @@ extern const char *program_name;
 #define CONTAINER_OF(POINTER, STRUCT, MEMBER)                           \
         ((STRUCT *) (void *) ((char *) (POINTER) - offsetof (STRUCT, MEMBER)))
 
+/* Given POINTER, the address of the given MEMBER within an object of the type
+ * that that OBJECT points to, returns OBJECT as a "void *" pointer.  OBJECT
+ * must be an lvalue.
+ *
+ * This is the same as CONTAINER_OF except that it infers the structure type
+ * from the type of '*OBJECT'. */
+#define OBJECT_CONTAINING(POINTER, OBJECT, MEMBER)                      \
+        ((void *) ((char *) (POINTER)                                   \
+                   - ((char *) &(OBJECT)->MEMBER - (char *) (OBJECT))))
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -122,9 +132,11 @@ bool str_to_ullong(const char *, int base, unsigned long long *);
 bool str_to_double(const char *, double *);
 
 int hexit_value(int c);
+unsigned int hexits_value(const char *s, size_t n, bool *ok);
 
 char *get_cwd(void);
 char *dir_name(const char *file_name);
+char *base_name(const char *file_name);
 char *abs_file_name(const char *dir, const char *file_name);
 
 void ignore(bool x OVS_UNUSED);