Merge "master" into "ovn".

[cascardo/ovs.git] / lib / util.h

diff --git a/lib/util.h b/lib/util.h
index 55fb50c..4dcb492 100644 (file)
--- a/lib/util.h
+++ b/lib/util.h
@@ -263,7 +263,7 @@ extern "C" {
         ovs_set_program_name(name, OVS_PACKAGE_VERSION)
 
 const char *get_subprogram_name(void);
-void set_subprogram_name(const char *format, ...) OVS_PRINTF_FORMAT(1, 2);
+    void set_subprogram_name(const char *);
 
 void ovs_print_version(uint8_t min_ofp, uint8_t max_ofp);
 
@@ -314,6 +314,9 @@ bool str_to_double(const char *, double *);
 int hexit_value(int c);
 uintmax_t hexits_value(const char *s, size_t n, bool *ok);
 
+int parse_int_string(const char *s, uint8_t *valuep, int field_width,
+                     char **tail);
+
 const char *english_list_delimiter(size_t index, size_t total);
 
 char *get_cwd(void);
@@ -555,6 +558,13 @@ void bitwise_put1(void *dst, unsigned int len, unsigned int ofs);
 void bitwise_put_bit(void *dst, unsigned int len, unsigned int ofs, bool);
 void bitwise_toggle_bit(void *dst, unsigned int len, unsigned int ofs);
 
+/* Returns non-zero if the parameters have equal value. */
+static inline int
+ovs_u128_equals(const ovs_u128 *a, const ovs_u128 *b)
+{
+    return (a->u64.hi == b->u64.hi) && (a->u64.lo == b->u64.lo);
+}
+
 void xsleep(unsigned int seconds);
 
 #ifdef _WIN32