X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Futil.h;h=703b93cf4c6e528ec0d5c48ae5034b03f0cd710f;hb=8321fb9c570bd25bb8925e7b5116ab90662113b5;hp=9df6db5836833522dfeb955fa98e19354f232fda;hpb=daf03c53ee14a0227b43330be2e638b9ad9ce022;p=openvswitch

diff --git a/lib/util.h b/lib/util.h
index 9df6db58..703b93cf 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -80,7 +80,17 @@ extern const char *program_name;
 /* Given POINTER, the address of the given MEMBER in a STRUCT object, returns
    the STRUCT object. */
 #define CONTAINER_OF(POINTER, STRUCT, MEMBER)                           \
-        ((STRUCT *) ((char *) (POINTER) - offsetof (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" {
@@ -88,7 +98,7 @@ extern "C" {
 
 void set_program_name(const char *);
 
-void ovs_print_version(char *date, char *time, 
+void ovs_print_version(char *date, char *time,
                        uint8_t min_ofp, uint8_t max_ofp);
 #define OVS_PRINT_VERSION(min_ofp, max_ofp) \
         ovs_print_version(__DATE__, __TIME__, (min_ofp), (max_ofp))
@@ -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);