X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Futil.h;h=bff6153a8daf354f8325394db035789be4d6f57b;hb=4c21aa063fa1c7f95800c95fafebedcd577ce674;hp=1bbcee27ba5d06ec78a73e1506ced61dc997c40a;hpb=437d0d22ab42d4101157b48a75fa844e7039e326;p=sliver-openvswitch.git diff --git a/lib/util.h b/lib/util.h index 1bbcee27b..bff6153a8 100644 --- a/lib/util.h +++ b/lib/util.h @@ -290,24 +290,7 @@ void ovs_hex_dump(FILE *, const void *, size_t, uintptr_t offset, bool ascii); bool str_to_int(const char *, int base, int *); bool str_to_long(const char *, int base, long *); bool str_to_llong(const char *, int base, long long *); - -static inline bool -str_to_uint(const char *s, int base, unsigned int *u) -{ - return str_to_int(s, base, (int *) u); -} - -static inline bool -str_to_ulong(const char *s, int base, unsigned long *ul) -{ - return str_to_long(s, base, (long *) ul); -} - -static inline bool -str_to_ullong(const char *s, int base, unsigned long long *ull) -{ - return str_to_llong(s, base, (long long *) ull); -} +bool str_to_uint(const char *, int base, unsigned int *); bool ovs_scan(const char *s, const char *format, ...) SCANF_FORMAT(2, 3); @@ -502,13 +485,13 @@ void bitwise_put(uint64_t value, uint64_t bitwise_get(const void *src, unsigned int src_len, unsigned int src_ofs, unsigned int n_bits); +void xsleep(unsigned int seconds); #ifdef _WIN32 char *ovs_format_message(int error); char *ovs_lasterror_to_string(void); int ftruncate(int fd, off_t length); #endif -unsigned int xsleep(unsigned int seconds); #ifdef __cplusplus }