tests: fix build with recent kernel headers

[strace] / string_to_uint.h

diff --git a/string_to_uint.h b/string_to_uint.h
index 6d26776fd56f2757fb03aa3811e595e4a660c3ac..daea1fa73b3d817d179c2e1a12815b09571890b1 100644 (file)
--- a/string_to_uint.h
+++ b/string_to_uint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2017 The strace developers.
+ * Copyright (c) 2001-2018 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,17 +28,42 @@
 #ifndef STRACE_STRING_TO_UINT_H
 #define STRACE_STRING_TO_UINT_H
 
-extern int
-string_to_uint(const char *str);
+#include <limits.h>
 
-extern int
+#include "kernel_types.h"
+
+extern long long
 string_to_uint_ex(const char *str, char **endptr,
-                 unsigned int max_val, const char *accepted_ending);
+                 unsigned long long max_val, const char *accepted_ending);
 
-static inline int
-string_to_uint_upto(const char *const str, const unsigned int max_val)
+static inline long long
+string_to_uint_upto(const char *const str, const unsigned long long max_val)
 {
        return string_to_uint_ex(str, NULL, max_val, NULL);
 }
 
+static inline int
+string_to_uint(const char *str)
+{
+       return string_to_uint_upto(str, INT_MAX);
+}
+
+static inline long
+string_to_ulong(const char *str)
+{
+       return string_to_uint_upto(str, LONG_MAX);
+}
+
+static inline kernel_long_t
+string_to_kulong(const char *str)
+{
+       return string_to_uint_upto(str, ((kernel_ulong_t) -1ULL) >> 1);
+}
+
+static inline long long
+string_to_ulonglong(const char *str)
+{
+       return string_to_uint_upto(str, LLONG_MAX);
+}
+
 #endif /* !STRACE_STRING_TO_UINT_H */